diff options
| author | Joe George <joe@zeroc.com> | 2016-11-28 11:44:31 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-11-28 11:44:31 -0500 |
| commit | 55676406e88cb6491f23c54e04ebe74c323ca17b (patch) | |
| tree | c57619d01e533e7e2abb2aa96a3e6e3eb58786ae /scripts/Util.py | |
| parent | Fixed staticFiltering test failure, network proxy test hang, added support fo... (diff) | |
| download | ice-55676406e88cb6491f23c54e04ebe74c323ca17b.tar.bz2 ice-55676406e88cb6491f23c54e04ebe74c323ca17b.tar.xz ice-55676406e88cb6491f23c54e04ebe74c323ca17b.zip | |
Python 3 test suite fixes
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index e00fc434db4..cfda99a83de 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2000,7 +2000,7 @@ class JavaScriptMapping(Mapping): def loadTestSuites(self, tests, filters, rfilters): Mapping.loadTestSuites(self, tests, filters, rfilters) - self.getServerMapping().loadTestSuites(self.testsuites.keys() + ["Ice/echo"]) + self.getServerMapping().loadTestSuites(list(self.testsuites.keys()) + ["Ice/echo"]) def getServerMapping(self): return Mapping.getByName("cpp") # By default, run clients against C++ mapping executables @@ -2123,7 +2123,7 @@ def runTests(mappings=None, drivers=None): # Provide the configurations to the driver and load the test suites for each mapping. # driver.setConfigs(configs) - for mapping in mappings + driver.getMappings(): + for mapping in list(mappings) + driver.getMappings(): mapping.loadTestSuites(args, driver.filters, driver.rfilters) # |