diff options
Diffstat (limited to 'python/test/Ice/exceptions')
| -rw-r--r-- | python/test/Ice/exceptions/AllTests.py | 18 | ||||
| -rwxr-xr-x | python/test/Ice/exceptions/Collocated.py | 2 | ||||
| -rwxr-xr-x | python/test/Ice/exceptions/Server.py | 6 | ||||
| -rwxr-xr-x | python/test/Ice/exceptions/ServerAMD.py | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py index 97d68ecabb0..5cab53dd6f4 100644 --- a/python/test/Ice/exceptions/AllTests.py +++ b/python/test/Ice/exceptions/AllTests.py @@ -172,7 +172,7 @@ class Callback(CallbackBase): try: raise ex except Ice.ObjectNotExistException as ex: - id = self._communicator.stringToIdentity("does not exist") + id = Ice.stringToIdentity("does not exist") test(ex.id == id) except: test(False) @@ -222,29 +222,29 @@ def allTests(communicator): communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default") adapter = communicator.createObjectAdapter("TestAdapter1") obj = EmptyI() - adapter.add(obj, communicator.stringToIdentity("x")) + adapter.add(obj, Ice.stringToIdentity("x")) try: - adapter.add(obj, communicator.stringToIdentity("x")) + adapter.add(obj, Ice.stringToIdentity("x")) test(false) except Ice.AlreadyRegisteredException: pass try: - adapter.add(obj, communicator.stringToIdentity("")) + adapter.add(obj, Ice.stringToIdentity("")) test(false) except Ice.IllegalIdentityException as ex: test(ex.id.name == "") try: - adapter.add(None, communicator.stringToIdentity("x")) + adapter.add(None, Ice.stringToIdentity("x")) test(false) except Ice.IllegalServantException: pass - adapter.remove(communicator.stringToIdentity("x")) + adapter.remove(Ice.stringToIdentity("x")) try: - adapter.remove(communicator.stringToIdentity("x")) + adapter.remove(Ice.stringToIdentity("x")) test(false) except Ice.NotRegisteredException: pass @@ -495,7 +495,7 @@ def allTests(communicator): sys.stdout.write("catching object not exist exception... ") sys.stdout.flush() - id = communicator.stringToIdentity("does not exist") + id = Ice.stringToIdentity("does not exist") try: thrower2 = Test.ThrowerPrx.uncheckedCast(thrower.ice_identity(id)) thrower2.throwAasA(1) @@ -664,7 +664,7 @@ def allTests(communicator): sys.stdout.write("catching object not exist exception with AMI mapping... ") sys.stdout.flush() - id = communicator.stringToIdentity("does not exist") + id = Ice.stringToIdentity("does not exist") thrower2 = Test.ThrowerPrx.uncheckedCast(thrower.ice_identity(id)) cb = Callback(communicator) thrower2.begin_throwAasA(1, cb.response, cb.exception_AasAObjectNotExist) diff --git a/python/test/Ice/exceptions/Collocated.py b/python/test/Ice/exceptions/Collocated.py index 0f49dc62e87..b1dc368a161 100755 --- a/python/test/Ice/exceptions/Collocated.py +++ b/python/test/Ice/exceptions/Collocated.py @@ -25,7 +25,7 @@ def run(args, communicator): properties.setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI() - adapter.add(object, communicator.stringToIdentity("thrower")) + adapter.add(object, Ice.stringToIdentity("thrower")) #adapter.activate() // Don't activate OA to ensure collocation is used. thrower = AllTests.allTests(communicator) diff --git a/python/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py index 560a2f06220..a3556e7f439 100755 --- a/python/test/Ice/exceptions/Server.py +++ b/python/test/Ice/exceptions/Server.py @@ -24,9 +24,9 @@ def run(args, communicator): adapter2 = communicator.createObjectAdapter("TestAdapter2") adapter3 = communicator.createObjectAdapter("TestAdapter3") object = TestI.ThrowerI() - adapter.add(object, communicator.stringToIdentity("thrower")) - adapter2.add(object, communicator.stringToIdentity("thrower")) - adapter3.add(object, communicator.stringToIdentity("thrower")) + adapter.add(object, Ice.stringToIdentity("thrower")) + adapter2.add(object, Ice.stringToIdentity("thrower")) + adapter3.add(object, Ice.stringToIdentity("thrower")) adapter.activate() adapter2.activate() adapter3.activate() diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py index 966ebd17618..ae11c454596 100755 --- a/python/test/Ice/exceptions/ServerAMD.py +++ b/python/test/Ice/exceptions/ServerAMD.py @@ -144,9 +144,9 @@ def run(args, communicator): adapter2 = communicator.createObjectAdapter("TestAdapter2") adapter3 = communicator.createObjectAdapter("TestAdapter3") object = ThrowerI() - adapter.add(object, communicator.stringToIdentity("thrower")) - adapter2.add(object, communicator.stringToIdentity("thrower")) - adapter3.add(object, communicator.stringToIdentity("thrower")) + adapter.add(object, Ice.stringToIdentity("thrower")) + adapter2.add(object, Ice.stringToIdentity("thrower")) + adapter3.add(object, Ice.stringToIdentity("thrower")) adapter.activate() adapter2.activate() adapter3.activate() |