commit bca52e0645d2c36ebe0e987551f126d3feb4f241
author Julien Desprez <jdesprez@google.com> Mon Jan 23 09:50:07 2017 +0000
committer Julien Desprez <jdesprez@google.com> Thu Jan 26 12:04:48 2017 +0000
tree af0212aa6327468bcc0d4f19a9d0322c6d2e230a
parent ea9bc55ff5373f93a6e55165816eb6d6ad029e46

Do not start/stop logcat invocation for TcpDevice

TcpDevice lifecycle starts later so no device is available
at early stage. These device will handle the logcat start
and stop themselves based on when they are up.

Test: unit tests, run google-gce-cts-launcher
Bug: 34571399
Change-Id: I6164c7a0f508d2ee18eaca0ce9c24324451d164d

src/com/android/tradefed/device/NativeDevice.java

diff --git a/src/com/android/tradefed/device/NativeDevice.java b/src/com/android/tradefed/device/NativeDevice.java
index 793dc1b..1b723b7 100644
--- a/src/com/android/tradefed/device/NativeDevice.java
+++ b/src/com/android/tradefed/device/NativeDevice.java
@@ -294,7 +294,7 @@
      *
      * @param delay the delay in ms
      */
-    void setLogStartDelay(int delay) {
+    protected void setLogStartDelay(int delay) {
         mLogStartDelay = delay;
     }
 

src/com/android/tradefed/invoker/TestInvocation.java

diff --git a/src/com/android/tradefed/invoker/TestInvocation.java b/src/com/android/tradefed/invoker/TestInvocation.java
index 5885cd4..d19ec46 100644
--- a/src/com/android/tradefed/invoker/TestInvocation.java
+++ b/src/com/android/tradefed/invoker/TestInvocation.java
@@ -843,7 +843,8 @@
     private void reportLogs(ITestDevice device, ITestInvocationListener listener, Stage stage) {
         InputStreamSource logcatSource = null;
         InputStreamSource emulatorOutput = null;
-        if (device != null) {
+        // only get logcat if we have an actual device available to avoid empty logs.
+        if (device != null && !(device.getIDevice() instanceof StubDevice)) {
             logcatSource = device.getLogcat();
             device.clearLogcat();
             if (device.getIDevice() != null && device.getIDevice().isEmulator()) {
@@ -1002,7 +1003,9 @@
                         config.getDeviceConfigByName(deviceName).getDeviceOptions());
                 if (config.getDeviceConfigByName(deviceName).getDeviceOptions()
                         .isLogcatCaptureEnabled()) {
-                    context.getDevice(deviceName).startLogcat();
+                    if (!(context.getDevice(deviceName).getIDevice() instanceof StubDevice)) {
+                        context.getDevice(deviceName).startLogcat();
+                    }
                 }
             }
 
@@ -1079,7 +1082,9 @@
         } finally {
             // ensure we always deregister the logger
             for (String deviceName : context.getDeviceConfigNames()) {
-                context.getDevice(deviceName).stopLogcat();
+                if (!(context.getDevice(deviceName).getIDevice() instanceof StubDevice)) {
+                    context.getDevice(deviceName).stopLogcat();
+                }
             }
             getLogRegistry().unregisterLogger();
             config.getLogOutput().closeLog();