| commit | f8cfd54e9509c10324e148c9ce0ffead386edeba | [log] [tgz] |
|---|---|---|
| author | Hridya Valsaraju <hridya@google.com> | Thu Apr 22 14:23:02 2021 -0700 |
| committer | Hridya Valsaraju <hridya@google.com> | Wed Apr 28 16:34:49 2021 -0700 |
| tree | 5d89bc8f6d1f2cec17e3f8f84d37f82b373464a6 | |
| parent | 046aad8735a0d1e3a7962589a614a16ec9b7119e [diff] |
Only skip fastbootd tests for GKI 1.0 Since vendor-boot is mandatory for GKI 2.0,it is valid for them to be enabled. Test: manual Bug: 185955438 Change-Id: I84cf6df3a74adc63bc97c58c4ac4e239186a7446
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)); } }
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)); } }