You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by di...@apache.org on 2006/12/15 19:42:12 UTC
svn commit: r487617 - in
/geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6:
AbstractWebModuleTest.java ContainerTest.java
Author: dims
Date: Fri Dec 15 10:42:11 2006
New Revision: 487617
URL: http://svn.apache.org/viewvc?view=rev&rev=487617
Log:
fix build failures on winxp, now jetty is sending back 404, added a sleep to prevent JVM_Bind exception
Modified:
geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ContainerTest.java
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java?view=diff&rev=487617&r1=487616&r2=487617
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java Fri Dec 15 10:42:11 2006
@@ -202,5 +202,6 @@
protected void tearDown() throws Exception {
connector.doStop();
+ Thread.sleep(1000);
}
}
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ContainerTest.java?view=diff&rev=487617&r1=487616&r2=487617
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ContainerTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ContainerTest.java Fri Dec 15 10:42:11 2006
@@ -37,9 +37,7 @@
fail();
} catch (Exception e) {
// 404 proves we spoke to the server even if we didn't get anything
- // TODO change back to 404 when Jetty server is updated
- // assertEquals(HttpURLConnection.HTTP_NOT_FOUND, connection.getResponseCode());
- assertEquals(HttpURLConnection.HTTP_SERVER_ERROR, connection.getResponseCode());
+ assertEquals(HttpURLConnection.HTTP_NOT_FOUND, connection.getResponseCode());
connection.disconnect();
}
}
@@ -65,9 +63,7 @@
fail();
} catch (Exception e) {
// see if we removed the ws.
- // TODO change back to 404 when Jetty server is updated
- //assertEquals(HttpURLConnection.HTTP_NOT_FOUND, connection.getResponseCode());
- assertEquals(HttpURLConnection.HTTP_SERVER_ERROR, connection.getResponseCode());
+ assertEquals(HttpURLConnection.HTTP_NOT_FOUND, connection.getResponseCode());
connection.disconnect();
}
}