diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-30 11:05:22 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-30 11:05:22 +0200 |
| commit | 6c30b776ef9d2fb4dee3e775cb41bb36f8b4c76e (patch) | |
| tree | c26310a484cd462d400e310e6f035ed8750073b7 /python/test | |
| parent | Fix ICE-7926 - Glacier2::SessionHelper::session implementation (diff) | |
| download | ice-6c30b776ef9d2fb4dee3e775cb41bb36f8b4c76e.tar.bz2 ice-6c30b776ef9d2fb4dee3e775cb41bb36f8b4c76e.tar.xz ice-6c30b776ef9d2fb4dee3e775cb41bb36f8b4c76e.zip | |
Fixed ICE-7930 - python Ice/location failure
Diffstat (limited to 'python/test')
| -rwxr-xr-x | python/test/Ice/location/Server.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/python/test/Ice/location/Server.py b/python/test/Ice/location/Server.py index 573bee0c8f3..b0451fe22f3 100755 --- a/python/test/Ice/location/Server.py +++ b/python/test/Ice/location/Server.py @@ -82,10 +82,9 @@ class ServerManagerI(Test.ServerManager): self._registry = registry self._communicators = [] self._initData = initData - self._initData.properties.setProperty("TestAdapter.Endpoints", "default") + self._nextPort = 1 self._initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter") self._initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter") - self._initData.properties.setProperty("TestAdapter2.Endpoints", "default") self._initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2") def startServer(self, current=None): @@ -100,8 +99,15 @@ class ServerManagerI(Test.ServerManager): # serverCommunicator = Ice.initialize(data=initData) self._communicators.append(serverCommunicator) - adapter = serverCommunicator.createObjectAdapter("TestAdapter") + def getTestEndpoint(): + self._nextPort += 1 + return "default -p {}".format(12010 + self._nextPort) + + serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint()) + serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint()) + + adapter = serverCommunicator.createObjectAdapter("TestAdapter") adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2") locator = serverCommunicator.stringToProxy("locator:default -p 12010") |