diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-21 17:47:35 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-21 17:49:06 +0100 |
| commit | a11945b449ae38efd6f79541c573c0028687c234 (patch) | |
| tree | b68a6c1b3a97b6e95009b5ec7810e891bb209a65 /scripts/LocalDriver.py | |
| parent | Fixed Android Bluetooth acceptor race condition, fixes #181 (diff) | |
| download | ice-a11945b449ae38efd6f79541c573c0028687c234.tar.bz2 ice-a11945b449ae38efd6f79541c573c0028687c234.tar.xz ice-a11945b449ae38efd6f79541c573c0028687c234.zip | |
Android and Xamarin test controller fixes and improvements
Diffstat (limited to 'scripts/LocalDriver.py')
| -rw-r--r-- | scripts/LocalDriver.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py index d779fce009f..354719b8809 100644 --- a/scripts/LocalDriver.py +++ b/scripts/LocalDriver.py @@ -239,6 +239,12 @@ class RemoteTestCaseRunner(TestCaseRunner): testSuiteIds = serverTestSuiteIds return mapping.getTestSuites(testSuiteIds) + def getHost(self, protocol, ipv6): + if self.clientController: + return self.clientController.getHost(protocol, ipv6) + else: + return self.serverController.getHost(protocol, ipv6) + def filterOptions(self, options): if options is None: return None @@ -606,6 +612,12 @@ class LocalDriver(Driver): current.testcase._runClientSide(current) + def getHost(self, protocol, ipv6): + if isinstance(self.runner, RemoteTestCaseRunner): + return self.runner.getHost(protocol, ipv6) + else: + return Driver.getHost(self, protocol, ipv6) + def isWorkerThread(self): return hasattr(self.threadlocal, "num") |