Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
Jan Bartel 2018-01-31 15:08:05 +01:00
parent 07b14b6454 8e55d0d6a7
commit 0a7725cac1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-osgi/test-jetty-osgi/pom.xml
View File

@ -147,7 +147,7 @@
<dependency> <dependency>
<groupId>org.apache.aries.spifly</groupId> <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.0.1</version> <version>1.0.10</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -390,13 +390,11 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>5.0.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId> <artifactId>asm-commons</artifactId>
<version>5.0.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

4
jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java
View File

@ -723,8 +723,8 @@ public abstract class ConnectorTimeoutTest extends HttpServerTestFixture
e.printStackTrace(); e.printStackTrace();
} }
int duration = (int)(System.currentTimeMillis() - start); int duration = (int)(System.currentTimeMillis() - start);
Assert.assertThat(duration,Matchers.greaterThanOrEqualTo(MAX_IDLE_TIME)); Assert.assertThat(duration+100,Matchers.greaterThanOrEqualTo(MAX_IDLE_TIME));
Assert.assertThat(duration,Matchers.lessThan(maximumTestRuntime)); Assert.assertThat(duration-100,Matchers.lessThan(maximumTestRuntime));
} }

8
tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/AbstractTest.java
View File

@ -81,9 +81,11 @@ public abstract class AbstractTest
.map(Transport::valueOf) .map(Transport::valueOf)
.collect(Collectors.toList()).toArray(); .collect(Collectors.toList()).toArray();
if (!OS.IS_UNIX) // TODO #2014 too many test failures, don't test unix socket client for now.
return EnumSet.complementOf(EnumSet.of(Transport.UNIX_SOCKET)).toArray(); // if (OS.IS_UNIX)
return Transport.values(); // return Transport.values();
return EnumSet.complementOf(EnumSet.of(Transport.UNIX_SOCKET)).toArray();
} }