diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-03-02 09:50:26 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-03-02 09:50:26 +0100 |
| commit | 60ea74978a11a8d91d9bb5473707e37ca9c88810 (patch) | |
| tree | f51dac2d2c21869ec2efa4a708961a47064489da | |
| parent | Updating SliceInfo for PHP/Python/Ruby (diff) | |
| download | ice-60ea74978a11a8d91d9bb5473707e37ca9c88810.tar.bz2 ice-60ea74978a11a8d91d9bb5473707e37ca9c88810.tar.xz ice-60ea74978a11a8d91d9bb5473707e37ca9c88810.zip | |
Workaround for ICE-8175, enabled again workers for .NETCore tests
| -rw-r--r-- | cpp/test/IceStorm/repstress/test.py | 7 | ||||
| -rw-r--r-- | scripts/Util.py | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cpp/test/IceStorm/repstress/test.py b/cpp/test/IceStorm/repstress/test.py index 14e56cdb5fc..8eaff402f37 100644 --- a/cpp/test/IceStorm/repstress/test.py +++ b/cpp/test/IceStorm/repstress/test.py @@ -107,13 +107,6 @@ 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] }, diff --git a/scripts/Util.py b/scripts/Util.py index 3bf1aa3478c..3df9376c8d7 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1831,7 +1831,8 @@ class TestSuite: def isMainThreadOnly(self, driver): for m in [CppMapping, JavaMapping, CSharpMapping]: config = driver.configs[self.mapping] - if isinstance(self.mapping, CSharpMapping) and config.netframework: + # TODO: WORKAROUND for ICE-8175 + if self.id.startswith("IceStorm"): return True elif isinstance(self.mapping, m): if "iphone" in config.buildPlatform or config.uwp: |