Revision: 6570 Author: [email protected] Date: Fri Oct 30 14:27:25 2009 Log: Reverting r6456 because it was causing JUnitShell to wait indefinitely for tests to finish. Since BrowserManagerServer can run tests in parallel (which it does by default), there is no need for this option.
Patch by: jlabanca Review by: jat http://code.google.com/p/google-web-toolkit/source/detail?r=6570 Modified: /trunk/user/src/com/google/gwt/junit/JUnitShell.java /trunk/user/src/com/google/gwt/junit/RunStyle.java /trunk/user/src/com/google/gwt/junit/RunStyleManual.java /trunk/user/src/com/google/gwt/junit/RunStyleRemoteWeb.java ======================================= --- /trunk/user/src/com/google/gwt/junit/JUnitShell.java Wed Oct 28 13:37:33 2009 +++ /trunk/user/src/com/google/gwt/junit/JUnitShell.java Fri Oct 30 14:27:25 2009 @@ -684,22 +684,15 @@ */ protected boolean notDone() { int activeClients = messageQueue.getNumClientsRetrievedTest(currentTestInfo); - if (firstLaunch && runStyle.isStartDelayed()) { - // Pretty print the list of clients for manual tests. - if (runStyle instanceof RunStyleManual) { - String[] newClients = messageQueue.getNewClients(); - int printIndex = activeClients - newClients.length + 1; - for (String newClient : newClients) { - System.out.println(printIndex + " - " + newClient); - ++printIndex; - } - } - - if (runStyle.wasInterrupted()) { - // Exit early if the test is interrupted. - throw new TimeoutException("A remote browser died a mysterious death."); - } else if (activeClients != this.numClients) { - // Wait forever for first contact. + if (firstLaunch && runStyle instanceof RunStyleManual) { + String[] newClients = messageQueue.getNewClients(); + int printIndex = activeClients - newClients.length + 1; + for (String newClient : newClients) { + System.out.println(printIndex + " - " + newClient); + ++printIndex; + } + if (activeClients != this.numClients) { + // Wait forever for first contact; user-driven. return true; } } ======================================= --- /trunk/user/src/com/google/gwt/junit/RunStyle.java Fri Oct 23 14:26:17 2009 +++ /trunk/user/src/com/google/gwt/junit/RunStyle.java Fri Oct 30 14:27:25 2009 @@ -49,15 +49,6 @@ public boolean initialize(String args) { return true; } - - /** - * Check whether or not tests start immediately or if they can be delayed. - * - * @return <code>true</code> if the test can be delayed - */ - public boolean isStartDelayed() { - return false; - } /** * Requests initial launch of the browser. This should only be called once per ======================================= --- /trunk/user/src/com/google/gwt/junit/RunStyleManual.java Fri Oct 23 14:26:17 2009 +++ /trunk/user/src/com/google/gwt/junit/RunStyleManual.java Fri Oct 30 14:27:25 2009 @@ -45,14 +45,6 @@ shell.setNumClients(numClients); return true; } - - /** - * Manual tests are started by users in user time. - */ - @Override - public boolean isStartDelayed() { - return true; - } @Override public void launchModule(String moduleName) throws UnableToCompleteException { ======================================= --- /trunk/user/src/com/google/gwt/junit/RunStyleRemoteWeb.java Fri Oct 23 14:26:17 2009 +++ /trunk/user/src/com/google/gwt/junit/RunStyleRemoteWeb.java Fri Oct 30 14:27:25 2009 @@ -200,14 +200,6 @@ Runtime.getRuntime().addShutdownHook(new ShutdownCb()); return true; } - - /** - * Remote web tests can be queued for extended periods. - */ - @Override - public boolean isStartDelayed() { - return true; - } @Override public synchronized void launchModule(String moduleName) --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
