# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1380617531 -14400
# Node ID 557d41234a97dfc6e2cabfa142544772b32ece96
# Parent  cdbda2058141c35eeeda0e5fc2e6b0b001f3afa5# Parent  55cf557a14de887c51fc693fe4e14f23cced1cca
Merge branch Gaya-8.0.x

diff -r cdbda2058141 -r 557d41234a97 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResultTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResultTest.java	Tue Oct 01 12:46:51 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResultTest.java	Tue Oct 01 12:52:11 2013 +0400
@@ -166,7 +166,7 @@
       StreamGobbler gobbler = new StreamGobbler(new ByteArrayInputStream(str.getBytes()));
       gobbler.start();
       try {
-        Thread.sleep(20);//wait for gobbler to read string
+        Thread.sleep(1000);//wait for gobbler to read string
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();
       }