summaryrefslogtreecommitdiff
path: root/scripts/tests/Ice/exceptions.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-01-26 16:51:31 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-01-26 16:51:31 +0100
commitee4ce4d680b8dc38f18b4b1271ac2dc977c84241 (patch)
tree8be53dec11d51efe3188855a0c431107b7c2f3d8 /scripts/tests/Ice/exceptions.py
parentFixed Windows JS binding test and bumped workers count for Travis (diff)
downloadice-ee4ce4d680b8dc38f18b4b1271ac2dc977c84241.tar.bz2
ice-ee4ce4d680b8dc38f18b4b1271ac2dc977c84241.tar.xz
ice-ee4ce4d680b8dc38f18b4b1271ac2dc977c84241.zip
Fixed JS tests to run again Ice/exceptions and optionals test with bidir
Diffstat (limited to 'scripts/tests/Ice/exceptions.py')
-rw-r--r--scripts/tests/Ice/exceptions.py10
1 files changed, 9 insertions, 1 deletions
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"):