Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Still trying to track down intermittent test failures under heavy load.

Browse Source
This commit is contained in:
akwizgran
2012-05-16 15:24:45 +02:00
parent 741c7cddfd
commit 9a6086b04a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
View File

@@ -46,7 +46,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
InetSocketAddress addr = new InetSocketAddress(host, port); InetSocketAddress addr = new InetSocketAddress(host, port);
Socket s = new Socket(); Socket s = new Socket();
s.connect(addr, 100); s.connect(addr, 100);
assertTrue(callback.connectionsLatch.await(5, TimeUnit.SECONDS)); assertTrue(callback.connectionsLatch.await(1, TimeUnit.MINUTES));
s.close(); s.close();
// Stop the plugin // Stop the plugin
plugin.stop(); plugin.stop();
@@ -90,7 +90,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
DuplexTransportConnection d = plugin.createConnection(contactId); DuplexTransportConnection d = plugin.createConnection(contactId);
assertNotNull(d); assertNotNull(d);
// Check that the connection was accepted // Check that the connection was accepted
assertTrue(latch.await(5, TimeUnit.SECONDS)); assertTrue(latch.await(1, TimeUnit.MINUTES));
assertFalse(error.get()); assertFalse(error.get());
// Clean up // Clean up
d.dispose(false, true); d.dispose(false, true);
@@ -105,11 +105,10 @@ public class SimpleSocketPluginTest extends BriarTestCase {
private final CountDownLatch propertiesLatch = new CountDownLatch(1); private final CountDownLatch propertiesLatch = new CountDownLatch(1);
private final CountDownLatch connectionsLatch = new CountDownLatch(1); private final CountDownLatch connectionsLatch = new CountDownLatch(1);
private TransportConfig config = new TransportConfig(); private volatile TransportProperties local = new TransportProperties();
private TransportProperties local = new TransportProperties();
public TransportConfig getConfig() { public TransportConfig getConfig() {
return config; return new TransportConfig();
} }
public TransportProperties getLocalProperties() { public TransportProperties getLocalProperties() {
@@ -120,9 +119,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
return remote; return remote;
} }
public void setConfig(TransportConfig c) { public void setConfig(TransportConfig c) {}
config = c;
}
public void setLocalProperties(TransportProperties p) { public void setLocalProperties(TransportProperties p) {
local = p; local = p;