Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2013-08-26 23:47:08 +0000
committerJoakim Erdfelt2013-08-26 23:47:08 +0000
commit866a9c96d2bf80d23050acc290aeca02f5fc0b6a (patch)
treef7d587e1d296fb6ad891ac46c47d0f56be653d7b /jetty-start/src/test/java
parent29670845e7f8ef19581c0bce2d82b045b9f2b27c (diff)
downloadorg.eclipse.jetty.project-866a9c96d2bf80d23050acc290aeca02f5fc0b6a.tar.gz
org.eclipse.jetty.project-866a9c96d2bf80d23050acc290aeca02f5fc0b6a.tar.xz
org.eclipse.jetty.project-866a9c96d2bf80d23050acc290aeca02f5fc0b6a.zip
jetty-start / removing --module= references in start.ini
+ making sure that demo.mod starts jetty appropriately. + making sure that --disable-module=demo works as advertised with jetty-distribution
Diffstat (limited to 'jetty-start/src/test/java')
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/ModulePersistenceTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulePersistenceTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulePersistenceTest.java
index 3b0d28041e..1d32f93df1 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulePersistenceTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulePersistenceTest.java
@@ -99,7 +99,7 @@ public class ModulePersistenceTest
// Load persistence file again
persistence = new ModulePersistence(mfile);
- Assert.assertThat("persistence.enabled",persistence.getEnabled(),containsInAnyOrder("websocket"));
+ Assert.assertThat("persistence.enabled",persistence.getEnabled(),containsInAnyOrder("server","websocket"));
}
@Test

Back to the top