diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-07-09 18:19:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-09 18:19:46 +0000 |
| commit | 2ab1d0638b6381d3394fb1fd562ba3afa4f9a3fa (patch) | |
| tree | ddf8b7afc1fda978e070d792bc731b2f3fd37269 | |
| parent | d7e6432474cbf27d521fd1e0634d0054ac02cf1f (diff) | |
| parent | f03888ea13c53951d19cc2ac8fb1e41213cb010c (diff) | |
| download | cts-2ab1d0638b6381d3394fb1fd562ba3afa4f9a3fa.tar.gz | |
Merge "Increase timeout for multiuser IME tests" into qt-dev
3 files changed, 7 insertions, 7 deletions
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/DeviceTestConstants.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/DeviceTestConstants.java index e69dc5f8789..d6bc90e8763 100644 --- a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/DeviceTestConstants.java +++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/DeviceTestConstants.java @@ -113,6 +113,6 @@ public final class DeviceTestConstants { private static final String NO_OP_TEST = "android.inputmethodservice.cts.devicetest.NoOpDeviceTest"; - public static final TestInfo TEST_WAIT_3SEC = - new TestInfo(PACKAGE, NO_OP_TEST, "testWait3Sec"); + public static final TestInfo TEST_WAIT_15SEC = + new TestInfo(PACKAGE, NO_OP_TEST, "testWait15Sec"); } diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/NoOpDeviceTest.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/NoOpDeviceTest.java index 34402ee0afe..dcd79f5ae46 100644 --- a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/NoOpDeviceTest.java +++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/NoOpDeviceTest.java @@ -29,9 +29,9 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class NoOpDeviceTest { - /** Does nothing but just wait 3 seconds. */ + /** Does nothing but just wait 15 seconds. */ @Test - public void testWait3Sec() { - SystemClock.sleep(3000); + public void testWait15Sec() { + SystemClock.sleep(15000); } } diff --git a/hostsidetests/inputmethodservice/hostside/src/android/inputmethodservice/cts/hostside/MultiUserTest.java b/hostsidetests/inputmethodservice/hostside/src/android/inputmethodservice/cts/hostside/MultiUserTest.java index af7d944516e..4c2d8846da6 100644 --- a/hostsidetests/inputmethodservice/hostside/src/android/inputmethodservice/cts/hostside/MultiUserTest.java +++ b/hostsidetests/inputmethodservice/hostside/src/android/inputmethodservice/cts/hostside/MultiUserTest.java @@ -351,13 +351,13 @@ public class MultiUserTest extends BaseHostJUnit4Test { try { // This test should never fail. If this fails, it means that the system was not yet // ready to run tests in this APK. - runTestAsUser(DeviceTestConstants.TEST_WAIT_3SEC, userId); + runTestAsUser(DeviceTestConstants.TEST_WAIT_15SEC, userId); return; } catch (AssertionError e) { // Ignoring because it can be because of Bug 132082599. } } - runTestAsUser(DeviceTestConstants.TEST_WAIT_3SEC, userId); + runTestAsUser(DeviceTestConstants.TEST_WAIT_15SEC, userId); } |