Skip to content

[tests] fix InstallAndroidDependenciesTest("GoogleV2") #9986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2025

Conversation

jonathanpeppers
Copy link
Member

This test has started failing as soon as a platform-tools 36.0.0 appeared on Google's feed:

_AndroidSdkDirectory was not set to new SDK path C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk. Please check the task output in 'install-deps.log'
Expected: True
But was:  False

I'm guessing this is because it is still "preview":

<remotePackage path="platform-tools">
  <type-details xsi:type="generic:genericDetailsType"/>
  <revision>
    <major>36</major>
    <minor>0</minor>
    <micro>0</micro>
  </revision>
  <display-name>Android SDK Platform-Tools</display-name>
  <uses-license ref="android-sdk-preview-license"/>

As the .binlog shows:

Component Android SDK Platform-Tools r36.0.0 not present on the system
Component Android SDK Platform-Tools r35.0.2 not present on the system

And then the next build refuses to use the SDK, due to adb.exe missing?

ValidateAndroidSdkLocation: for locator=constructor param, path=`C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk`, result=False
ValidateAndroidSdkLocation: for locator=preferred path, path=``, result=False
Looking for Android SDK...
ValidateAndroidSdkLocation: for locator=all paths, path=`C:\Android\android-sdk`, found adb `C:\Android\android-sdk\platform-tools\adb.EXE`
...
ResolveSdks Outputs:
  AndroidSdkPath: C:\Android\android-sdk

If I change the GetCurrentPlatformToolsVersion() method to ignore entries with:

<uses-license ref="android-sdk-preview-license"/>

Then the test passes for me locally.

It seems reasonable to ignore "preview" versions of platform-tools for this test.

This test has started failing as soon as a `platform-tools` 36.0.0
appeared on Google's feed:

    _AndroidSdkDirectory was not set to new SDK path C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk. Please check the task output in 'install-deps.log'
    Expected: True
    But was:  False

I'm guessing this is because it is still "preview":

    <remotePackage path="platform-tools">
      <type-details xsi:type="generic:genericDetailsType"/>
      <revision>
        <major>36</major>
        <minor>0</minor>
        <micro>0</micro>
      </revision>
      <display-name>Android SDK Platform-Tools</display-name>
      <uses-license ref="android-sdk-preview-license"/>

As the `.binlog` shows:

    Component Android SDK Platform-Tools r36.0.0 not present on the system
    Component Android SDK Platform-Tools r35.0.2 not present on the system

And then the next build refuses to use the SDK, due to `adb.exe` missing?

    ValidateAndroidSdkLocation: for locator=constructor param, path=`C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk`, result=False
    ValidateAndroidSdkLocation: for locator=preferred path, path=``, result=False
    Looking for Android SDK...
    ValidateAndroidSdkLocation: for locator=all paths, path=`C:\Android\android-sdk`, found adb `C:\Android\android-sdk\platform-tools\adb.EXE`
    ...
    ResolveSdks Outputs:
      AndroidSdkPath: C:\Android\android-sdk

If I change the `GetCurrentPlatformToolsVersion()` method to ignore
entries with:

    <uses-license ref="android-sdk-preview-license"/>

Then the test passes for me locally.

It seems reasonable to ignore "preview" versions of `platform-tools`
for this test.
@jonathanpeppers jonathanpeppers merged commit 0312b15 into main Mar 31, 2025
57 of 59 checks passed
@jonathanpeppers jonathanpeppers deleted the dev/peppers/GoogleV2 branch March 31, 2025 13:37
jonathanpeppers added a commit that referenced this pull request Mar 31, 2025
This test has started failing as soon as a `platform-tools` 36.0.0
appeared on Google's feed:

    _AndroidSdkDirectory was not set to new SDK path C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk. Please check the task output in 'install-deps.log'
    Expected: True
    But was:  False

I'm guessing this is because it is still "preview":

    <remotePackage path="platform-tools">
      <type-details xsi:type="generic:genericDetailsType"/>
      <revision>
        <major>36</major>
        <minor>0</minor>
        <micro>0</micro>
      </revision>
      <display-name>Android SDK Platform-Tools</display-name>
      <uses-license ref="android-sdk-preview-license"/>

As the `.binlog` shows:

    Component Android SDK Platform-Tools r36.0.0 not present on the system
    Component Android SDK Platform-Tools r35.0.2 not present on the system

And then the next build refuses to use the SDK, due to `adb.exe` missing?

    ValidateAndroidSdkLocation: for locator=constructor param, path=`C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk`, result=False
    ValidateAndroidSdkLocation: for locator=preferred path, path=``, result=False
    Looking for Android SDK...
    ValidateAndroidSdkLocation: for locator=all paths, path=`C:\Android\android-sdk`, found adb `C:\Android\android-sdk\platform-tools\adb.EXE`
    ...
    ResolveSdks Outputs:
      AndroidSdkPath: C:\Android\android-sdk

If I change the `GetCurrentPlatformToolsVersion()` method to ignore
entries with:

    <uses-license ref="android-sdk-preview-license"/>

Then the test passes for me locally.

It seems reasonable to ignore "preview" versions of `platform-tools`
for this test.
jonpryor pushed a commit that referenced this pull request Apr 7, 2025
This test has started failing as soon as a `platform-tools` 36.0.0
appeared on Google's feed:

    _AndroidSdkDirectory was not set to new SDK path C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk. Please check the task output in 'install-deps.log'
    Expected: True
    But was:  False

I'm guessing this is because it is still "preview":

    <remotePackage path="platform-tools">
      <type-details xsi:type="generic:genericDetailsType"/>
      <revision>
        <major>36</major>
        <minor>0</minor>
        <micro>0</micro>
      </revision>
      <display-name>Android SDK Platform-Tools</display-name>
      <uses-license ref="android-sdk-preview-license"/>

As the `.binlog` shows:

    Component Android SDK Platform-Tools r36.0.0 not present on the system
    Component Android SDK Platform-Tools r35.0.2 not present on the system

And then the next build refuses to use the SDK, due to `adb.exe` missing?

    ValidateAndroidSdkLocation: for locator=constructor param, path=`C:\a\_work\1\a\TestRelease\03-28_03.15.36\temp\InstallAndroidDependenciesTestGoogleV2\android-sdk`, result=False
    ValidateAndroidSdkLocation: for locator=preferred path, path=``, result=False
    Looking for Android SDK...
    ValidateAndroidSdkLocation: for locator=all paths, path=`C:\Android\android-sdk`, found adb `C:\Android\android-sdk\platform-tools\adb.EXE`
    ...
    ResolveSdks Outputs:
      AndroidSdkPath: C:\Android\android-sdk

If I change the `GetCurrentPlatformToolsVersion()` method to ignore
entries with:

    <uses-license ref="android-sdk-preview-license"/>

Then the test passes for me locally.

It seems reasonable to ignore "preview" versions of `platform-tools`
for this test.
@github-actions github-actions bot locked and limited conversation to collaborators May 1, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants