commit 350c26a4bf3cbac2ade8a2343d7bfb0d61f143fd
author JW Wang <wangchun@google.com> Wed Apr 01 18:03:28 2020 +0800
committer JW Wang <wangchun@google.com> Wed Apr 01 18:33:20 2020 +0800
tree a50411acbd1e3649b2dab6772acc127524c66346
parent 5a0549cd42a01352473d42ab39ed8458d47e9cce

Fix a flaky test.

See b/152840581#comment2 for the analysis.

call #waitForDeviceNotAvailable to wait for reboot reliably.

Bug: 152840581
Test: atest NetworkStagedRollbackTest
Change-Id: Ibbc9998c74681b1b8fc29b90ea66406f39ae7443

tests/RollbackTest/Android.bp

diff --git a/tests/RollbackTest/Android.bp b/tests/RollbackTest/Android.bp
index 24623fb..2be4ae6 100644
--- a/tests/RollbackTest/Android.bp
+++ b/tests/RollbackTest/Android.bp
@@ -39,7 +39,7 @@
     name: "NetworkStagedRollbackTest",
     srcs: ["NetworkStagedRollbackTest/src/**/*.java"],
     libs: ["tradefed"],
-    static_libs: ["testng", "RollbackTestLib"],
+    static_libs: ["RollbackTestLib"],
     test_suites: ["general-tests"],
     test_config: "NetworkStagedRollbackTest.xml",
 }