Skip to content
Snippets Groups Projects
Commit 78e1513a authored by akwizgran's avatar akwizgran
Browse files

Fixed a test.

Connections can occasionally be made to a server
socket after ServerSocket.close() has returned, so don't check that a
connection attempt fails.
parent 9a6086b0
No related branches found
No related tags found
No related merge requests found
......@@ -46,16 +46,10 @@ public class SimpleSocketPluginTest extends BriarTestCase {
InetSocketAddress addr = new InetSocketAddress(host, port);
Socket s = new Socket();
s.connect(addr, 100);
assertTrue(callback.connectionsLatch.await(1, TimeUnit.MINUTES));
assertTrue(callback.connectionsLatch.await(5, TimeUnit.SECONDS));
s.close();
// Stop the plugin
plugin.stop();
// The plugin should no longer be listening
try {
s = new Socket();
s.connect(addr, 100);
fail();
} catch(IOException expected) {}
}
@Test
......@@ -90,7 +84,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
DuplexTransportConnection d = plugin.createConnection(contactId);
assertNotNull(d);
// Check that the connection was accepted
assertTrue(latch.await(1, TimeUnit.MINUTES));
assertTrue(latch.await(5, TimeUnit.SECONDS));
assertFalse(error.get());
// Clean up
d.dispose(false, true);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment