Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-04-13 01:34:41 +0000
committerGreg Wilkins2011-04-13 01:34:41 +0000
commit07462afa38f2d8afa8b2bea05681a785a5e27c7c (patch)
tree7e6783d81f9d4963583baca3793708afe80557c6 /jetty-deploy
parent65aa81c018c8cf4b8fe0b466abea8e15744b958d (diff)
downloadorg.eclipse.jetty.project-07462afa38f2d8afa8b2bea05681a785a5e27c7c.tar.gz
org.eclipse.jetty.project-07462afa38f2d8afa8b2bea05681a785a5e27c7c.tar.xz
org.eclipse.jetty.project-07462afa38f2d8afa8b2bea05681a785a5e27c7c.zip
another attempt to make this work on windows
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3012 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-deploy')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
index 7c4a8ffedb..7741259f07 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
@@ -147,14 +147,13 @@ public class ScanningAppProviderRuntimeUpdatesTest
// Test that webapp response contains "-1"
jetty.assertResponseContains("/foo/info","FooServlet-1");
- Thread.sleep(1900);
+ waitForDirectoryScan();
System.out.println("Updating war files");
jetty.copyContext("foo.xml","foo.xml"); // essentially "touch" the context xml
jetty.copyWebapp("foo-webapp-2.war","foo.war");
// This should result in the existing foo.war being replaced with the new foo.war
waitForDirectoryScan();
- waitForDirectoryScan();
jetty.assertWebAppContextsExists("/foo");
// Test that webapp response contains "-2"

Back to the top