summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Damiano <adamdoes@google.com>2023-05-25 22:46:49 +0000
committerAdam Damiano <adamdoes@google.com>2023-05-26 23:59:55 +0000
commitc1f7fee6af25bdc24137bde366d1ae4dec40fd17 (patch)
tree0ea3b41905345bc4346d416b6c58e475aebf244a
parent2f8bf6c300b0be9847ece7f2f8e742b0a0a86405 (diff)
downloadidea-c1f7fee6af25bdc24137bde366d1ae4dec40fd17.tar.gz
Fix UpdateTest
After restarting Android Studio, the test tries re-attaching to the Android Studio process. This was taking longer than 30 seconds. As a result, I increased the timeout to 120 seconds. This brought the failure rate from ~95% to 0%. Strangely, the test always succeeded for me locally even with the original timeout, although I couldn't run anywhere near the same number of times locally. Fixes: 284193142 Test: UpdateTest Change-Id: I6351d2db0b21d53b3b255db2b0ca806d936c7b93 (cherry picked from commit 5c9890c670da4b6585fbe2510c371181b16b5596)
-rw-r--r--as-driver/utils/testSrc/com/android/tools/asdriver/tests/AndroidStudio.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/as-driver/utils/testSrc/com/android/tools/asdriver/tests/AndroidStudio.java b/as-driver/utils/testSrc/com/android/tools/asdriver/tests/AndroidStudio.java
index 6ba2b7751b3..6db6425caec 100644
--- a/as-driver/utils/testSrc/com/android/tools/asdriver/tests/AndroidStudio.java
+++ b/as-driver/utils/testSrc/com/android/tools/asdriver/tests/AndroidStudio.java
@@ -130,7 +130,7 @@ public class AndroidStudio implements AutoCloseable {
}
static private int waitForDriverPid(LogFile reader) throws IOException, InterruptedException {
- Matcher matcher = reader.waitForMatchingLine(".*STDOUT - as-driver started on pid: (\\d+).*", null, true, 30, TimeUnit.SECONDS);
+ Matcher matcher = reader.waitForMatchingLine(".*STDOUT - as-driver started on pid: (\\d+).*", null, true, 120, TimeUnit.SECONDS);
return Integer.parseInt(matcher.group(1));
}