commit e28529399c18f7c162919501d263668bf5db6e8e
author Jonathan Scott <scottjonathan@google.com> Wed Apr 06 18:57:50 2022 +0000
committer Jonathan Scott <scottjonathan@google.com> Wed Apr 06 18:57:50 2022 +0000
tree 1af66de8e6d5fdb6739be00abae55128b3838d0d
parent ee4f172ae77837e680d4c651b9e93a258e52f341

Revert "Make test timeout dynamic so it matches the infrastructure."

This reverts commit ee4f172ae77837e680d4c651b9e93a258e52f341.

Reason for revert: b/228341353

Change-Id: I27837b873d1e20acf851a7b379fd4af87c28845a

common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java

diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
index f8ec3108..203dc68 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
@@ -197,18 +197,14 @@
 
     private static final String TV_PROFILE_TYPE_NAME = "com.android.tv.profile";
 
-    // We timeout 10 seconds before the infra would timeout
-    private static final Duration MAX_TEST_DURATION =
-            Duration.ofMillis(
-                    Long.parseLong(TestApis.instrumentation().arguments().getString(
-                            "timeout_msec", "600000")) - 10000);
+    // We are allowed 11 minutes before the entire test run fails
+    private static final Duration MAX_TEST_DURATION = Duration.ofMinutes(10);
     private final ExecutorService mTestExecutor = Executors.newSingleThreadExecutor();
     private Thread mTestThread;
 
     private final Logger mLogger = Logger.forInstance(this);
 
     public DeviceState() {
-
         mLogger.constructor(() -> {
             Future<Thread> testThreadFuture = mTestExecutor.submit(Thread::currentThread);
 

common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java

diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java
index 79eb2b8..b2530e8 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java
@@ -43,7 +43,6 @@
         try {
             ShellCommand.builder("input keyevent")
                     .addOperand("KEYCODE_WAKEUP")
-                    .allowEmptyOutput(true)
                     .validate(String::isEmpty)
                     .execute();
         } catch (AdbException e) {