commit 0b7cbfaab59e0721c46570ab06ca5f5422b6566a
author Guang Zhu <guangzhu@google.com> Fri Jan 15 22:18:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 15 22:18:02 2016 +0000
tree 06c4d5fad6f69bb3ffdb8b1a62dcf49218325a85
parent 9b7e7d091deaeca04544ee90a017f4c1fa8fcc17
parent 26601f905eb90a861774f6c2119515243d97bbc6

Merge "Properly transition the state of a device if disconnected"

src/com/android/tradefed/command/CommandScheduler.java

diff --git a/src/com/android/tradefed/command/CommandScheduler.java b/src/com/android/tradefed/command/CommandScheduler.java
index c2d0b97..85ce676 100644
--- a/src/com/android/tradefed/command/CommandScheduler.java
+++ b/src/com/android/tradefed/command/CommandScheduler.java
@@ -42,6 +42,7 @@
 import com.android.tradefed.device.IDeviceMonitor;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.device.NoDeviceException;
+import com.android.tradefed.device.TestDeviceState;
 import com.android.tradefed.invoker.IRescheduler;
 import com.android.tradefed.invoker.ITestInvocation;
 import com.android.tradefed.invoker.TestInvocation;
@@ -473,10 +474,14 @@
                 // remove invocation thread first so another invocation can be started on device
                 // when freed
                 removeInvocationThread(this);
-                mCmd.commandFinished(elapsedTime);
+                if (!TestDeviceState.ONLINE.equals(mDevice.getDeviceState())) {
+                    //If the device is offline at the end of the test
+                    deviceState = FreeDeviceState.UNAVAILABLE;
+                }
                 for (final IScheduledInvocationListener listener : mListeners) {
                     listener.invocationComplete(mDevice, deviceState);
                 }
+                mCmd.commandFinished(elapsedTime);
             }
         }
 

tests/src/com/android/tradefed/command/CommandSchedulerTest.java

diff --git a/tests/src/com/android/tradefed/command/CommandSchedulerTest.java b/tests/src/com/android/tradefed/command/CommandSchedulerTest.java
index 0fcb782..132fd28 100644
--- a/tests/src/com/android/tradefed/command/CommandSchedulerTest.java
+++ b/tests/src/com/android/tradefed/command/CommandSchedulerTest.java
@@ -29,6 +29,7 @@
 import com.android.tradefed.device.IDeviceManager;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.device.MockDeviceManager;
+import com.android.tradefed.device.TestDeviceState;
 import com.android.tradefed.invoker.IRescheduler;
 import com.android.tradefed.invoker.ITestInvocation;
 import com.android.tradefed.log.ITerribleFailureHandler;
@@ -269,6 +270,7 @@
 
         ITestDevice mockDevice = EasyMock.createMock(ITestDevice.class);
         EasyMock.expect(mockDevice.getSerialNumber()).andStubReturn("serial");
+        EasyMock.expect(mockDevice.getDeviceState()).andStubReturn(TestDeviceState.ONLINE);
         IScheduledInvocationListener mockListener = EasyMock
                 .createMock(IScheduledInvocationListener.class);
         mockListener.invocationComplete(mockDevice, FreeDeviceState.AVAILABLE);