summaryrefslogtreecommitdiff
path: root/scripts/tests
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-01-25 12:18:26 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-01-25 12:18:26 +0100
commitefd75b629aba6115bf35b1c6b7f8928fc412893a (patch)
treec9a493eb3f736c8fd007fdf0817d83e0b2bb94e5 /scripts/tests
parentMoved the clearing of the router info into the try/catch block (ICE-8615) (diff)
downloadice-efd75b629aba6115bf35b1c6b7f8928fc412893a.tar.bz2
ice-efd75b629aba6115bf35b1c6b7f8928fc412893a.tar.xz
ice-efd75b629aba6115bf35b1c6b7f8928fc412893a.zip
Removed Ice.MessageSizeMax from clients where it's no longer necessary (ICE-8340)
Diffstat (limited to 'scripts/tests')
-rw-r--r--scripts/tests/Ice/metrics.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/tests/Ice/metrics.py b/scripts/tests/Ice/metrics.py
index d2ece8de332..35b3634f074 100644
--- a/scripts/tests/Ice/metrics.py
+++ b/scripts/tests/Ice/metrics.py
@@ -14,8 +14,14 @@ traceProps = {
"Ice.Trace.Retry" : 1,
"Ice.Trace.Protocol" : 1
}
+testcases = [
+ ClientServerTestCase(traceProps=traceProps),
+]
+if Mapping.getByPath(__name__).hasSource("Ice/metrics", "serveramd"):
+ testcases += [ ClientAMDServerTestCase(traceProps=traceProps) ]
+if Mapping.getByPath(__name__).hasSource("Ice/metrics", "collocated"):
+ testcases += [ CollocatedTestCase(traceProps=traceProps) ]
-TestSuite(__name__,
- [ClientServerTestCase(traceProps=traceProps)],
+TestSuite(__name__, testcases,
options = { "ipv6" : [False], "compress": [False], "protocol" : ["tcp", "ssl"] },
multihost=False)