commit 2e0ce1af951d3bd2d5cce3161894f9c99c792348
author Dan Shi <dshi@google.com> Tue May 04 19:52:22 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 04 19:52:22 2021 +0000
tree 16f0fd6ca4834d664bf22a1d6003ae6fb53016d9
parent f8cfd54e9509c10324e148c9ce0ffead386edeba
parent 457d0f3be7fd8606e1fc48be8a44ae84ef69c629

Merge "Remove utils/native/testability_checker"

testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java

diff --git a/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java b/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
index eab1ffd..e2c5406 100644
--- a/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
+++ b/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
@@ -60,10 +60,8 @@
             Pattern p = Pattern.compile("^(\\d+)\\.(\\d+)");
             Matcher m1 = p.matcher(output);
             Assert.assertTrue(m1.find());
-            Assume.assumeTrue("Skipping test for fastbootd on GKI",
-                              Integer.parseInt(m1.group(1)) < 5 ||
-                              (Integer.parseInt(m1.group(1)) == 5 &&
-                               Integer.parseInt(m1.group(2)) < 4));
+            Assume.assumeFalse("Skipping test for fastbootd on GKI 1.0",
+                    (Integer.parseInt(m1.group(1)) == 5 && Integer.parseInt(m1.group(2)) == 4));
         }
     }
 

testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java

diff --git a/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java b/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
index 9319b48..286c1b6 100644
--- a/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
+++ b/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
@@ -65,10 +65,8 @@
             Pattern p = Pattern.compile("^(\\d+)\\.(\\d+)");
             Matcher m1 = p.matcher(output);
             Assert.assertTrue(m1.find());
-            Assume.assumeTrue("Skipping test for fastbootd on GKI",
-                              Integer.parseInt(m1.group(1)) < 5 ||
-                              (Integer.parseInt(m1.group(1)) == 5 &&
-                               Integer.parseInt(m1.group(2)) < 4));
+            Assume.assumeFalse("Skipping test for fastbootd on GKI 1.0",
+                    (Integer.parseInt(m1.group(1)) == 5 && Integer.parseInt(m1.group(2)) == 4));
         }
     }