commit 38a07addaa8d4ea20998cfc57b241fbc3e148167
author Guang Zhu <guangzhu@google.com> Sun Aug 09 20:16:17 2015 -0700
committer The Android Automerger <android-build@android.com> Mon Aug 10 13:54:38 2015 -0700
tree c76f9a48e0d56e9448613143ac622bd5fa2a097c
parent b6ab3b21fce45f10fc939976f1bf409f63b7fe13

CTS runner fixes

1. For InstrumentationTest, don't set method, class, package names;
   this is because the list of test methods to run is already
   computed by test filtering and passed to runner via file based
   mechanism
2. For test failure logcat, change sleep from 10ms to 2s before
   capturing logcat after a failed test method.

Bug: 23033702
Bug: 23061510
Change-Id: Ie9b1108fe243dc7082195d75e97c8c77843eb7ee

tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java

diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
index 01f148ae..d74cce5 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
@@ -289,9 +289,8 @@
         @Override
         public void testFailed(TestIdentifier test, String trace) {
             super.testFailed(test, trace);
-            // sleep a small amount of time to ensure test failure stack trace makes it into logcat
-            // capture
-            RunUtil.getDefault().sleep(10);
+            // sleep 2s to ensure test failure stack trace makes it into logcat capture
+            RunUtil.getDefault().sleep(2 * 1000);
             InputStreamSource logSource = mDevice.getLogcat(mNumLogcatBytes);
             super.testLog(String.format("logcat-%s_%s", test.getClassName(), test.getTestName()),
                     LogDataType.TEXT, logSource);

tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java

diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
index f276f1d..12c3ddd 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
@@ -308,9 +308,6 @@
         instrTest.setRunName(mAppPackageName);
         instrTest.setPackageName(mAppNameSpace);
         instrTest.setRunnerName(mRunner);
-        instrTest.setTestPackageName(mTestPackageName);
-        instrTest.setClassName(mClassName);
-        instrTest.setMethodName(mMethodName);
         instrTest.setAbi(mAbi);
         instrTest.setTestsToRun(mTests, false
             /* force batch mode off to always run using testFile */);