Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gorovoy2011-05-17 22:16:58 -0400
committerMichael Gorovoy2011-05-17 22:16:58 -0400
commit990fea3a0464592d11aa566628ff8696adde526d (patch)
tree7145fa8d82133aba458540601765847a7077075c
parent5b7811ca76f4c940d01f90cedbaf9b3c216936b2 (diff)
downloadorg.eclipse.jetty.project-990fea3a0464592d11aa566628ff8696adde526d.tar.gz
org.eclipse.jetty.project-990fea3a0464592d11aa566628ff8696adde526d.tar.xz
org.eclipse.jetty.project-990fea3a0464592d11aa566628ff8696adde526d.zip
346179 o.e.j.util.ScannerTest fails on MacOS X platform
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3197 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt7
-rw-r--r--jetty-util/pom.xml6
-rw-r--r--jetty-util/src/test/java/org/eclipse/jetty/util/ScannerTest.java13
3 files changed, 13 insertions, 13 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 7182f8897f..7b4f8f0103 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,4 @@
-jetty-7.4.2-SNAPSHOT
+jetty-7.4.2-SNAPSHOT
+ 338364 Fixed expires header for set cookies
+ 345729 binding for managing server and system classes globally
+ 345615 Enable SSL Session caching
@@ -6,6 +6,7 @@ jetty-7.4.2-SNAPSHOT
+ 345873 Update jetty-ssl.xml to new style
+ 345900 Handle ipv6 with default port
+ 346014 Fixed full HttpGenerator
+ + 346179 o.e.j.util.ScannerTest fails on MacOS X platform
+ JETTY-1342 Recreate selector if wakeup throws JVM bug
jetty-7.4.1.v20110513
@@ -22,7 +23,7 @@ jetty-7.4.1.v20110513
+ 343680 Handle OSGi bundle jars not ending in ".war"
+ 343707 'REQUEST' is printed on console for each incoming HTTP request
+ 343923 flush timeouts applied to outer loop
- + 343936 Session idle calls unbind and remove listeners
+ + 343936 Session idle calls unbind and remove listeners
+ 344059 Websockets draft-07
+ 344067 Add support for OSGi fragment bundles to add static resources to web-bundles
+ 344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE
@@ -30,7 +31,7 @@ jetty-7.4.1.v20110513
+ 345047 Readded deprecated ScanningAppDeployer#setMonitoredDir
+ 345290 Weak references from SessionIdManager. HashSessionManager cleanup.
+ 345543 Always close endpoint on SSLException
- + 345656 Disambiguate SslContextFactory#validateCerts property
+ + 345656 Disambiguate SslContextFactory#validateCerts property
+ 345679 Allow setting an initialized KeyStore as keystore/truststore of SslContextFactory
+ 345704 jetty-nested works with forwarded SSL in cloudfoundry
+ JETTY-954 WebAppContext eats any start exceptions instead of stopping the server load
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 728341e4d1..077b343a42 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -70,6 +70,11 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -80,6 +85,5 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
-
</dependencies>
</project>
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/ScannerTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/ScannerTest.java
index 90f7898b7b..c43167f127 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/ScannerTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/ScannerTest.java
@@ -6,11 +6,11 @@ import java.io.IOException;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
+import org.eclipse.jetty.toolchain.test.OS;
import org.eclipse.jetty.util.Scanner.Notification;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -84,15 +84,10 @@ public class ScannerTest
}
}
- private void assumeNotWindows()
- {
- Assume.assumeTrue(!System.getProperty("os.name").toLowerCase().contains("windows"));
- }
-
@Test
public void testAddedChangeRemove() throws Exception
{
- assumeNotWindows();
+ Assume.assumeTrue(!OS.IS_WINDOWS && !OS.IS_OSX);
touch("a0");
@@ -200,7 +195,7 @@ public class ScannerTest
@Test
public void testSizeChange() throws Exception
{
- assumeNotWindows();
+ Assume.assumeTrue(!OS.IS_WINDOWS && !OS.IS_OSX);
touch("tsc0");
_scanner.scan();

Back to the top