commit 5529c9465a021f6befecc8b95884310796925cc0
author Dan Shi <dshi@google.com> Mon Oct 12 19:45:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 12 19:45:12 2020 +0000
tree 4a070cd36f9477876ce6ced5cee5b8d23808f0d8
parent 860437964c130012019825f7c264aaf1586a11a2
parent 814e9fc046e737645e1cca82f60daabc0b5f9043

Remove vts10 tradefed harness and related doc am: 3021c8f484 am: 814e9fc046

Original change: https://android-review.googlesource.com/c/platform/test/vts/+/1456143

Change-Id: Ib11180258c53d577a2a3fdfbbd902b03554e3400

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 74107bd..d21c315 100644
--- a/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
+++ b/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
@@ -92,7 +92,7 @@
     @Test
     public void testFastbootdSlotOperations() throws Exception {
         CommandResult result = mRunUtil.runTimedCmd(MAX_CMD_RUN_TIME, mFuzzyFastbootPath,
-                String.format("--serial=%s", mDevice.getSerialNumber()),
+                String.format("--serial=%s", mDevice.getFastbootSerialNumber()),
                 "--gtest_filter=Conformance.Slots:Conformance.SetActive");
         Assert.assertEquals(CommandStatus.SUCCESS, result.getStatus());
     }
@@ -101,7 +101,7 @@
     @Test
     public void testLogicalPartitionCommands() throws Exception {
         CommandResult result = mRunUtil.runTimedCmd(MAX_CMD_RUN_TIME, mFuzzyFastbootPath,
-                String.format("--serial=%s", mDevice.getSerialNumber()),
+                String.format("--serial=%s", mDevice.getFastbootSerialNumber()),
                 "--gtest_filter=LogicalPartitionCompliance.GetVarIsLogical:LogicalPartitionCompliance.SuperPartition");
         Assert.assertEquals(CommandStatus.SUCCESS, result.getStatus());
     }
@@ -117,7 +117,7 @@
     @Test
     public void testFastbootReboot() throws Exception {
         CommandResult result = mRunUtil.runTimedCmd(MAX_CMD_RUN_TIME, mFuzzyFastbootPath,
-                String.format("--serial=%s", mDevice.getSerialNumber()),
+                String.format("--serial=%s", mDevice.getFastbootSerialNumber()),
                 "--gtest_filter=LogicalPartitionCompliance.FastbootRebootTest");
         Assert.assertEquals(CommandStatus.SUCCESS, result.getStatus());
     }
@@ -126,7 +126,7 @@
     @Test
     public void testLogicalPartitionFlashing() throws Exception {
         CommandResult result = mRunUtil.runTimedCmd(MAX_CMD_RUN_TIME, mFuzzyFastbootPath,
-                String.format("--serial=%s", mDevice.getSerialNumber()),
+                String.format("--serial=%s", mDevice.getFastbootSerialNumber()),
                 "--gtest_filter=LogicalPartitionCompliance.CreateResizeDeleteLP");
         Assert.assertEquals(CommandStatus.SUCCESS, result.getStatus());
     }