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

#6327 enable more disabled tests 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2021-08-06 11:15:58 +02:00
parent 15bef0c9ed
commit a99ff502d1
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-server/src/test/java/org/eclipse/jetty/server/ConnectionOpenCloseTest.java
View File

@ -34,9 +34,7 @@ import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
@ -46,8 +44,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConnectionOpenCloseTest extends AbstractHttpTest public class ConnectionOpenCloseTest extends AbstractHttpTest
{ {
@Test @Test
@Tag("Slow")
@DisabledIfSystemProperty(named = "env", matches = "ci") // TODO: SLOW, needs review
public void testOpenClose() throws Exception public void testOpenClose() throws Exception
{ {
server.setHandler(new AbstractHandler() server.setHandler(new AbstractHandler()
@ -97,8 +93,6 @@ public class ConnectionOpenCloseTest extends AbstractHttpTest
} }
@Test @Test
@Tag("Slow")
@DisabledIfSystemProperty(named = "env", matches = "ci") // TODO: SLOW, needs review
public void testOpenRequestClose() throws Exception public void testOpenRequestClose() throws Exception
{ {
server.setHandler(new AbstractHandler() server.setHandler(new AbstractHandler()
@ -153,15 +147,13 @@ public class ConnectionOpenCloseTest extends AbstractHttpTest
assertTrue(closeLatch.await(5, TimeUnit.SECONDS)); assertTrue(closeLatch.await(5, TimeUnit.SECONDS));
// Wait some time to see if the callbacks are called too many times // Wait some time to see if the callbacks are called too many times
TimeUnit.SECONDS.sleep(1); TimeUnit.MILLISECONDS.sleep(200);
assertEquals(2, callbacks.get()); assertEquals(2, callbacks.get());
} }
} }
@Test @Test
@Tag("Slow")
@DisabledIfSystemProperty(named = "env", matches = "ci") // TODO: SLOW, needs review
public void testSSLOpenRequestClose() throws Exception public void testSSLOpenRequestClose() throws Exception
{ {
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
@ -223,7 +215,7 @@ public class ConnectionOpenCloseTest extends AbstractHttpTest
assertTrue(closeLatch.await(5, TimeUnit.SECONDS)); assertTrue(closeLatch.await(5, TimeUnit.SECONDS));
// Wait some time to see if the callbacks are called too many times // Wait some time to see if the callbacks are called too many times
TimeUnit.SECONDS.sleep(1); TimeUnit.MILLISECONDS.sleep(200);
assertEquals(4, callbacks.get()); assertEquals(4, callbacks.get());
} }