diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /scripts/tests/Ice/retry.py | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'scripts/tests/Ice/retry.py')
| -rw-r--r-- | scripts/tests/Ice/retry.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/tests/Ice/retry.py b/scripts/tests/Ice/retry.py index ff589037696..b245f40f459 100644 --- a/scripts/tests/Ice/retry.py +++ b/scripts/tests/Ice/retry.py @@ -10,4 +10,9 @@ traceProps = { "Ice.Trace.Protocol" : 1 } -TestSuite(__name__, [ClientServerTestCase(traceProps=traceProps)]) +testcases = [ClientServerTestCase(traceProps=traceProps)] + +if Mapping.getByPath(__name__).hasSource("Ice/metrics", "collocated"): + testcases += [ CollocatedTestCase(traceProps=traceProps) ] + +TestSuite(__name__, testcases) |