summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-12-07 20:04:21 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-12-07 20:04:21 +0100
commit664cf0780a68461292632e9461474191bfd75125 (patch)
treecd277a2ad2f6f7b54f8840f88f947158fcfb1d1e /scripts/Util.py
parentFixed test scripts to allow running JS tests even when --protocol is set (diff)
downloadice-664cf0780a68461292632e9461474191bfd75125.tar.bz2
ice-664cf0780a68461292632e9461474191bfd75125.tar.xz
ice-664cf0780a68461292632e9461474191bfd75125.zip
Additional fix for automated test failures
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index ab7a7120004..634f6c65b75 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -2164,8 +2164,6 @@ def runTestsWithPath(path):
def runTests(mappings=None, drivers=None):
if not mappings:
mappings = Mapping.getAll()
- else:
- mappings = list(set([m.getClientMapping() for m in mappings] + [m.getServerMapping() for m in mappings]))
if not drivers:
drivers = Driver.getAll()
@@ -2211,7 +2209,7 @@ def runTests(mappings=None, drivers=None):
# Create the configurations for each mapping
#
configs = {}
- for mapping in mappings:
+ for mapping in list(set([m.getClientMapping() for m in mappings] + [m.getServerMapping() for m in mappings])):
configs[mapping] = mapping.createConfig(opts[:])
#