diff options
| author | Joe George <joe@zeroc.com> | 2016-07-19 11:08:30 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-07-19 15:50:28 -0400 |
| commit | 1b9ad1d49c3381c1dc30839016fb3b20fde98ac8 (patch) | |
| tree | e89344ddbaabbedf0b22d400b9d2cfc98427e931 /python | |
| parent | ICE-7241 - Python Ice/optional cross test failure (diff) | |
| download | ice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.tar.bz2 ice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.tar.xz ice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.zip | |
ICE-7240 - Python Ice/servantLocator cross test
Diffstat (limited to 'python')
| -rw-r--r-- | python/test/Ice/servantLocator/AllTests.py | 2 | ||||
| -rw-r--r-- | python/test/Ice/servantLocator/TestI.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/test/Ice/servantLocator/AllTests.py b/python/test/Ice/servantLocator/AllTests.py index 966b5245334..73b55b42b69 100644 --- a/python/test/Ice/servantLocator/AllTests.py +++ b/python/test/Ice/servantLocator/AllTests.py @@ -222,5 +222,5 @@ def allTests(communicator, collocated): except: test(False) print("ok") - + return obj diff --git a/python/test/Ice/servantLocator/TestI.py b/python/test/Ice/servantLocator/TestI.py index 5e095ce54a4..b486be66982 100644 --- a/python/test/Ice/servantLocator/TestI.py +++ b/python/test/Ice/servantLocator/TestI.py @@ -85,12 +85,12 @@ class ServantLocatorI(Ice.ServantLocator): def __del__(self): test(self._deactivated) - + def locate(self, current): test(not self._deactivated) test(current.id.category == self._category or self._category == "") - + if current.id.name == "unknown": return None @@ -117,7 +117,7 @@ class ServantLocatorI(Ice.ServantLocator): test(current.id.category == self._category or self._category == "") test(current.id.name == "locate" or current.id.name == "finished") - + if current.id.name == "finished": self.exception(current) |