commit 8c9b6dcb65fc4a5035ba4278d291993d88302546
author Jeff Sharkey <jsharkey@android.com> Fri Mar 18 17:06:34 2016 -0600
committer Daniel Xie <dxie@google.com> Mon Mar 28 02:19:20 2016 +0000
tree 8a11ef2242c4c9287932bbe074e631b86f325b6d
parent 1ccc5f67f258eb0f218f1fbd4c35f9819a9a17e5

DO NOT MERGE: Increase AdoptableHostTest timeout.

Bug: 26829428
Change-Id: I1ce6b64275d18ad4881d53e5aa26642720155d0f

hostsidetests/appsecurity/src/com/android/cts/appsecurity/AdoptableHostTest.java

diff --git a/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AdoptableHostTest.java b/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AdoptableHostTest.java
index 2ae2e10..6bf2a01 100644
--- a/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AdoptableHostTest.java
+++ b/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AdoptableHostTest.java
@@ -26,6 +26,7 @@
 import com.android.cts.appsecurity.SplitTests.BaseInstallMultiple;
 import com.android.cts.tradefed.build.CtsBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IAbi;
@@ -33,6 +34,7 @@
 import com.android.tradefed.testtype.IBuildReceiver;
 
 import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Set of tests that verify behavior of adopted storage media, if supported.
@@ -147,7 +149,10 @@
         final LocalVolumeInfo vol = getAdoptionVolume();
 
         // Move storage there and verify that data went along for ride
-        assertSuccess(getDevice().executeShellCommand("pm move-primary-storage " + vol.uuid));
+        final CollectingOutputReceiver out = new CollectingOutputReceiver();
+        getDevice().executeShellCommand("pm move-primary-storage " + vol.uuid, out, 2,
+                TimeUnit.HOURS, 1);
+        assertSuccess(out.getOutput());
         runDeviceTests(PKG, CLASS, "testPrimaryAdopted");
         runDeviceTests(PKG, CLASS, "testPrimaryDataRead");