summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/IceStorm/repstress/test.py9
-rw-r--r--cpp/test/IceStorm/stress/test.py9
2 files changed, 9 insertions, 9 deletions
diff --git a/cpp/test/IceStorm/repstress/test.py b/cpp/test/IceStorm/repstress/test.py
index 970491821d9..3a9fd27105c 100644
--- a/cpp/test/IceStorm/repstress/test.py
+++ b/cpp/test/IceStorm/repstress/test.py
@@ -107,7 +107,14 @@ class IceStormRepStressTestCase(IceStormTestCase):
current.writeln("publisher published %s events, subscriber received %s events" % (publisherCount, subscriberCount))
+#
+# TODO: WORKAROUND: we run this test on the main thread only for now to investigate a
+# sporadic hang on Windows. This test supports workers but when it hangs we don't get
+# the output. We should remove this workaround once the hang is fixed or no longer
+# shows up.
+#
+
TestSuite(__file__,
[ IceStormRepStressTestCase("replicated", icestorm=icestorm) ],
options={ "ipv6" : [False] },
- multihost=False)
+ multihost=False, runOnMainThread=True)
diff --git a/cpp/test/IceStorm/stress/test.py b/cpp/test/IceStorm/stress/test.py
index 6b7fe614dd9..6164e74fcc2 100644
--- a/cpp/test/IceStorm/stress/test.py
+++ b/cpp/test/IceStorm/stress/test.py
@@ -143,13 +143,6 @@ class IceStormStressTestCase(IceStormTestCase):
s.stop(current, True)
current.writeln("ok")
-#
-# TODO: WORKAROUND: we run this test on the main thread only for now to investigate a
-# sporadic hang on Windows. This test supports workers but when it hangs we don't get
-# the output. We should remove this workaround once the hang is fixed or no longer
-# shows up.
-#
-
TestSuite(__file__, [
IceStormStressTestCase("persistent", icestorm=[IceStorm("TestIceStorm1", quiet=True),
@@ -159,4 +152,4 @@ TestSuite(__file__, [
[IceStorm("TestIceStorm1", i, 3, quiet=True) for i in range(0,3)] +
[IceStorm("TestIceStorm2", i, 3, portnum=20, quiet=True) for i in range(0,3)]),
-], multihost=False, runOnMainThread=True)
+], multihost=False)