From a1ac3924ff96ddd03a39efe2cd5d4570ca13bc29 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 12 Jun 2014 19:43:39 +0400 Subject: [PATCH] reduced timeout in tests to one minute down from ridiculous ten minutes --- .../com/intellij/ui/debugger/extensions/PlaybackDebugger.java | 2 +- platform/util/src/com/intellij/util/WaitFor.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java index 579d7a19405a..20c2a7ae110c 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java @@ -406,7 +406,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta new Thread() { @Override public void run() { - new WaitFor() { + new WaitFor(60000) { @Override protected boolean condition() { return KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow() instanceof IdeFrame || myRunner == null; diff --git a/platform/util/src/com/intellij/util/WaitFor.java b/platform/util/src/com/intellij/util/WaitFor.java index e1271ac15730..775b25a84c27 100644 --- a/platform/util/src/com/intellij/util/WaitFor.java +++ b/platform/util/src/com/intellij/util/WaitFor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NonNls; */ public abstract class WaitFor { private static final int DEFAULT_STEP = 10; - private static final int MAX_TIMEOUT = 600 * 1000; + private static final int MAX_TIMEOUT = 60 * 1000; private long myWaitTime; private boolean myInterrupted;