summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-12-31 15:00:15 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-12-31 15:00:15 (GMT)
commitcb1cc3c0205295002f2cd760cbd801842b30096e (patch)
treed45c97ba64c75a69b99202b49fc0c230da1987ce /Swiften/Network/UnitTest
parenta0a3f3a587295a5a0ef57af6ae34e8e97db60ef7 (diff)
downloadswift-contrib-cb1cc3c0205295002f2cd760cbd801842b30096e.zip
swift-contrib-cb1cc3c0205295002f2cd760cbd801842b30096e.tar.bz2
Put a timeout of 60s on connecting & resolving.
Resolves: #87.
Diffstat (limited to 'Swiften/Network/UnitTest')
-rw-r--r--Swiften/Network/UnitTest/ConnectorTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/UnitTest/ConnectorTest.cpp b/Swiften/Network/UnitTest/ConnectorTest.cpp
index 08b9bc1..663011c 100644
--- a/Swiften/Network/UnitTest/ConnectorTest.cpp
+++ b/Swiften/Network/UnitTest/ConnectorTest.cpp
@@ -24,9 +24,9 @@ class ConnectorTest : public CppUnit::TestFixture {
CPPUNIT_TEST(testConnect_AllSRVHostsFailWithoutFallbackHost);
CPPUNIT_TEST(testConnect_AllSRVHostsFailWithFallbackHost);
CPPUNIT_TEST(testConnect_SRVAndFallbackHostsFail);
- //CPPUNIT_TEST(testConnect_TimeoutDuringResolve);
- //CPPUNIT_TEST(testConnect_TimeoutDuringConnect);
- //CPPUNIT_TEST(testConnect_NoTimeout);
+ CPPUNIT_TEST(testConnect_TimeoutDuringResolve);
+ CPPUNIT_TEST(testConnect_TimeoutDuringConnect);
+ CPPUNIT_TEST(testConnect_NoTimeout);
CPPUNIT_TEST_SUITE_END();
public:
@@ -186,7 +186,7 @@ class ConnectorTest : public CppUnit::TestFixture {
private:
Connector* createConnector() {
- Connector* connector = new Connector("foo.com", resolver, connectionFactory);
+ Connector* connector = new Connector("foo.com", resolver, connectionFactory, timerFactory);
connector->onConnectFinished.connect(boost::bind(&ConnectorTest::handleConnectorFinished, this, _1));
return connector;
}