Revision: 6614 Author: [email protected] Date: Tue Nov 3 12:37:03 2009 Log: Merges tr...@6611 into releases/2.0 Fix accidentally extended timeout in JUnitShell svn merge --ignore-ancestry -c 6611 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=6614 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java ======================================= --- /releases/2.0/branch-info.txt Tue Nov 3 10:24:07 2009 +++ /releases/2.0/branch-info.txt Tue Nov 3 12:37:03 2009 @@ -213,3 +213,6 @@ Make ClientBundle and MhtmlResourceContext generators emit stable output. svn merge --ignore-ancestry -c 6606 http://google-web-toolkit.googlecode.com/svn/trunk/ . +tr...@6611 was merged into this branch + Fix accidentally extended timeout in JUnitShell + svn merge --ignore-ancestry -c 6611 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Mon Nov 2 13:18:15 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Tue Nov 3 12:37:03 2009 @@ -320,7 +320,7 @@ * begin running the test. "Contacted" does not necessarily mean "the test has * begun," e.g. for linker errors stopping the test initialization. */ - static final int TEST_BEGIN_TIMEOUT_MILLIS = 60000; + static final int TEST_BEGIN_TIMEOUT_MILLIS = 60 * 1000; /** * This is a system property that, when set, emulates command line arguments. @@ -332,7 +332,7 @@ * method, in milliseconds, measured from when the <i>last</i> client connects * (and thus starts the test). default of 5 minutes. */ - private static final long TEST_METHOD_TIMEOUT_MILLIS = 50 * 60 * 1000; + private static final long TEST_METHOD_TIMEOUT_MILLIS = 5 * 60 * 1000; /** * Singleton object for hosting unit tests. All test case instances executed --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
