summaryrefslogtreecommitdiff
path: root/src/mongo/executor/network_interface_asio_integration_test.cpp
diff options
context:
space:
mode:
authorsamantharitter <samantha.ritter@10gen.com>2015-11-10 15:16:12 -0500
committersamantharitter <samantha.ritter@10gen.com>2015-11-10 15:18:28 -0500
commit47f20b624ea81232b9c30d69f1b4f982891494dc (patch)
treeb8b76630b0dd8ecde01fe941b2d0bb17421aaebe /src/mongo/executor/network_interface_asio_integration_test.cpp
parentb34e99131cfe1d032238d2067f32fded5790b80a (diff)
downloadmongo-47f20b624ea81232b9c30d69f1b4f982891494dc.tar.gz
SERVER-20674 Enable timeouts in NetworkInterfaceASIO stress test
Diffstat (limited to 'src/mongo/executor/network_interface_asio_integration_test.cpp')
-rw-r--r--src/mongo/executor/network_interface_asio_integration_test.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mongo/executor/network_interface_asio_integration_test.cpp b/src/mongo/executor/network_interface_asio_integration_test.cpp
index 76c23169683..56e43009a68 100644
--- a/src/mongo/executor/network_interface_asio_integration_test.cpp
+++ b/src/mongo/executor/network_interface_asio_integration_test.cpp
@@ -190,6 +190,7 @@ public:
}
static Deferred<Status> runTimeoutOp(Fixture* fixture, Pool* pool) {
+ // Timeout is 5 seconds.
return StressTestOp(BSON("sleep" << 1 << "lock"
<< "none"
<< "secs" << 10),
@@ -249,7 +250,7 @@ TEST_F(NetworkInterfaceASIOIntegrationTest, StressTest) {
[&rng, &pool, this] {
// stagger operations slightly to mitigate connection pool contention
- sleepmillis(1);
+ sleepmillis(10);
switch (rng.nextInt32(3)) {
case 0:
@@ -257,10 +258,7 @@ TEST_F(NetworkInterfaceASIOIntegrationTest, StressTest) {
case 1:
return StressTestOp::runCompleteOp(this, &pool);
case 2:
- // TODO: Reenable runTimeoutOp after we fix whatever bug causes it
- // to hang.
- // return StressTestOp::runTimeoutOp(this, &pool);
- return StressTestOp::runCompleteOp(this, &pool);
+ return StressTestOp::runTimeoutOp(this, &pool);
default:
MONGO_UNREACHABLE;