diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-26 16:51:31 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-26 16:51:31 +0100 |
| commit | ee4ce4d680b8dc38f18b4b1271ac2dc977c84241 (patch) | |
| tree | 8be53dec11d51efe3188855a0c431107b7c2f3d8 | |
| parent | Fixed Windows JS binding test and bumped workers count for Travis (diff) | |
| download | ice-ee4ce4d680b8dc38f18b4b1271ac2dc977c84241.tar.bz2 ice-ee4ce4d680b8dc38f18b4b1271ac2dc977c84241.tar.xz ice-ee4ce4d680b8dc38f18b4b1271ac2dc977c84241.zip | |
Fixed JS tests to run again Ice/exceptions and optionals test with bidir
| -rw-r--r-- | cpp/test/Ice/echo/test.py | 2 | ||||
| -rw-r--r-- | scripts/tests/Ice/exceptions.py | 10 | ||||
| -rw-r--r-- | scripts/tests/Ice/optional.py | 9 |
3 files changed, 18 insertions, 3 deletions
diff --git a/cpp/test/Ice/echo/test.py b/cpp/test/Ice/echo/test.py index 27ced12e84c..7842bd5ea80 100644 --- a/cpp/test/Ice/echo/test.py +++ b/cpp/test/Ice/echo/test.py @@ -12,4 +12,4 @@ class EchoServerTestCase(ClientServerTestCase): def runClientSide(self, current): pass -TestSuite(__name__, [EchoServerTestCase(name="server", server=Server(waitForShutdown=False))]) +TestSuite(__name__, [EchoServerTestCase(name="server", server=Server(quiet=True, waitForShutdown=False))]) diff --git a/scripts/tests/Ice/exceptions.py b/scripts/tests/Ice/exceptions.py index 268d40fd8d2..b180a17e4a9 100644 --- a/scripts/tests/Ice/exceptions.py +++ b/scripts/tests/Ice/exceptions.py @@ -18,7 +18,15 @@ if Mapping.getByPath(__name__).hasSource("Ice/exceptions", "serveramd"): testcases += [ ClientAMDServerTestCase("client/amd server with compact format"), ClientAMDServerTestCase("client/amd server with sliced format", props={ "Ice.Default.SlicedFormat" : True }), - ClientAMDServerTestCase("client/amd server with 1.0 encoding", props={ "Ice.Default.EncodingVersion" : "1.0" }), + ClientAMDServerTestCase("client/amd server with 1.0 encoding", props={ "Ice.Default.EncodingVersion" : "1.0"}), + ] + +# If the mapping has bidir clients, also run with the bidir clients. +if Mapping.getByPath(__name__).getClientMapping().hasSource("Ice/exceptions", "clientBidir"): + testcases += [ + ClientEchoServerTestCase("client/echo server with compact format"), + ClientEchoServerTestCase("client/echo server with sliced format", props={"Ice.Default.SlicedFormat" : True}), + ClientEchoServerTestCase("client/echo server with 1.0 encoding", props={"Ice.Default.EncodingVersion" : "1.0"}), ] if Mapping.getByPath(__name__).hasSource("Ice/exceptions", "collocated"): diff --git a/scripts/tests/Ice/optional.py b/scripts/tests/Ice/optional.py index b706d197749..0de74f758ff 100644 --- a/scripts/tests/Ice/optional.py +++ b/scripts/tests/Ice/optional.py @@ -14,10 +14,17 @@ testcases = [ ] # If the mapping has AMD servers, also run with the AMD servers -if Mapping.getByPath(__name__).hasSource("Ice/exceptions", "serveramd"): +if Mapping.getByPath(__name__).hasSource("Ice/optional", "serveramd"): testcases += [ ClientAMDServerTestCase("client/amd server with compact format"), ClientAMDServerTestCase("client/amd server with sliced format", props={ "Ice.Default.SlicedFormat" : True }), ] +# If the mapping has bidir clients, also run with the bidir clients. +if Mapping.getByPath(__name__).getClientMapping().hasSource("Ice/optional", "clientBidir"): + testcases += [ + ClientEchoServerTestCase("client/echo server with compact format"), + ClientEchoServerTestCase("client/echo server with sliced format", props={ "Ice.Default.SlicedFormat" : True }), + ] + TestSuite(__name__, testcases)
\ No newline at end of file |