diff options
Diffstat (limited to 'scripts/tests')
| -rw-r--r-- | scripts/tests/Ice/exceptions.py | 10 | ||||
| -rw-r--r-- | scripts/tests/Ice/optional.py | 9 |
2 files changed, 17 insertions, 2 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"): 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 |