Fixed ICE-8132 - Ice/slicing/exceptions failure with UWP/SSL

3 files changed, 104 insertions, 97 deletions

diff --git a/python/test/Ice/slicing/exceptions/AllTests.py b/python/test/Ice/slicing/exceptions/AllTests.py
index 92602a5ce80..e80429d8748 100644
--- a/python/test/Ice/slicing/exceptions/AllTests.py
+++ b/python/test/Ice/slicing/exceptions/AllTests.py
@@ -508,91 +508,90 @@ def allTests(communicator):
         test(False)
     print("ok")
 
-    defaultHost = communicator.getProperties().getProperty("Ice.Default.Host")
-    if defaultHost == "127.0.0.1" or defaultHost == "::1":
-        sys.stdout.write("preserved exceptions... ")
-        sys.stdout.flush()
-        adapter = communicator.createObjectAdapterWithEndpoints("Relay", "default")
-        relay = Test.RelayPrx.uncheckedCast(adapter.addWithUUID(RelayI()))
-        adapter.activate()
+    sys.stdout.write("preserved exceptions... ")
+    sys.stdout.flush()
+    adapter = communicator.createObjectAdapter("")
+    relay = Test.RelayPrx.uncheckedCast(adapter.addWithUUID(RelayI()))
+    adapter.activate()
+    t.ice_getConnection().setAdapter(adapter)
 
-        try:
-            t.relayKnownPreservedAsBase(relay)
-            test(False)
-        except Test.KnownPreservedDerived as ex:
-            test(ex.b == "base")
-            test(ex.kp == "preserved")
-            test(ex.kpd == "derived")
-        except Ice.OperationNotExistException:
-            pass
-        except:
-            test(False)
+    try:
+        t.relayKnownPreservedAsBase(relay)
+        test(False)
+    except Test.KnownPreservedDerived as ex:
+        test(ex.b == "base")
+        test(ex.kp == "preserved")
+        test(ex.kpd == "derived")
+    except Ice.OperationNotExistException:
+        pass
+    except:
+        test(False)
 
-        try:
-            t.relayKnownPreservedAsKnownPreserved(relay)
-            test(False)
-        except Test.KnownPreservedDerived as ex:
-            test(ex.b == "base")
-            test(ex.kp == "preserved")
-            test(ex.kpd == "derived")
-        except Ice.OperationNotExistException:
-            pass
-        except:
-            test(False)
+    try:
+        t.relayKnownPreservedAsKnownPreserved(relay)
+        test(False)
+    except Test.KnownPreservedDerived as ex:
+        test(ex.b == "base")
+        test(ex.kp == "preserved")
+        test(ex.kpd == "derived")
+    except Ice.OperationNotExistException:
+        pass
+    except:
+        test(False)
 
-        try:
-            t.relayUnknownPreservedAsBase(relay)
-            test(False)
-        except Test.Preserved2 as ex:
-            test(ex.b == "base")
-            test(ex.kp == "preserved")
-            test(ex.kpd == "derived")
-            test(ex.p1.ice_id() == Test.PreservedClass.ice_staticId())
-            pc = ex.p1
-            test(isinstance(pc, Test.PreservedClass))
-            test(pc.bc == "bc")
-            test(pc.pc == "pc")
-            test(ex.p2 == ex.p1)
-        except Test.KnownPreservedDerived as ex:
-            #
-            # For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
-            #
-            test(t.ice_getEncodingVersion() == Ice.Encoding_1_0)
-            test(ex.b == "base")
-            test(ex.kp == "preserved")
-            test(ex.kpd == "derived")
-        except Ice.OperationNotExistException:
-            pass
-        except:
-            test(False)
+    try:
+        t.relayUnknownPreservedAsBase(relay)
+        test(False)
+    except Test.Preserved2 as ex:
+        test(ex.b == "base")
+        test(ex.kp == "preserved")
+        test(ex.kpd == "derived")
+        test(ex.p1.ice_id() == Test.PreservedClass.ice_staticId())
+        pc = ex.p1
+        test(isinstance(pc, Test.PreservedClass))
+        test(pc.bc == "bc")
+        test(pc.pc == "pc")
+        test(ex.p2 == ex.p1)
+    except Test.KnownPreservedDerived as ex:
+        #
+        # For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
+        #
+        test(t.ice_getEncodingVersion() == Ice.Encoding_1_0)
+        test(ex.b == "base")
+        test(ex.kp == "preserved")
+        test(ex.kpd == "derived")
+    except Ice.OperationNotExistException:
+        pass
+    except:
+        test(False)
 
-        try:
-            t.relayUnknownPreservedAsKnownPreserved(relay)
-            test(False)
-        except Test.Preserved2 as ex:
-            test(ex.b == "base")
-            test(ex.kp == "preserved")
-            test(ex.kpd == "derived")
-            test(ex.p1.ice_id() == Test.PreservedClass.ice_staticId())
-            pc = ex.p1
-            test(isinstance(pc, Test.PreservedClass))
-            test(pc.bc == "bc")
-            test(pc.pc == "pc")
-            test(ex.p2 == ex.p1)
-        except Test.KnownPreservedDerived as ex:
-            #
-            # For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
-            #
-            test(t.ice_getEncodingVersion() == Ice.Encoding_1_0)
-            test(ex.b == "base")
-            test(ex.kp == "preserved")
-            test(ex.kpd == "derived")
-        except Ice.OperationNotExistException:
-            pass
-        except:
-            test(False)
+    try:
+        t.relayUnknownPreservedAsKnownPreserved(relay)
+        test(False)
+    except Test.Preserved2 as ex:
+        test(ex.b == "base")
+        test(ex.kp == "preserved")
+        test(ex.kpd == "derived")
+        test(ex.p1.ice_id() == Test.PreservedClass.ice_staticId())
+        pc = ex.p1
+        test(isinstance(pc, Test.PreservedClass))
+        test(pc.bc == "bc")
+        test(pc.pc == "pc")
+        test(ex.p2 == ex.p1)
+    except Test.KnownPreservedDerived as ex:
+        #
+        # For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
+        #
+        test(t.ice_getEncodingVersion() == Ice.Encoding_1_0)
+        test(ex.b == "base")
+        test(ex.kp == "preserved")
+        test(ex.kpd == "derived")
+    except Ice.OperationNotExistException:
+        pass
+    except:
+        test(False)
 
-        adapter.destroy()
-        print("ok")
+    adapter.destroy()
+    print("ok")
 
     return t
diff --git a/python/test/Ice/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py
index 44a58914a5f..0a52aa525ab 100755
--- a/python/test/Ice/slicing/exceptions/Server.py
+++ b/python/test/Ice/slicing/exceptions/Server.py
@@ -121,11 +121,13 @@ class TestI(Test.TestIntf):
         ex.kpd = "derived"
         raise ex
 
-    def relayKnownPreservedAsBase(self, r, current=None):
-        r.knownPreservedAsBase()
+    def relayKnownPreservedAsBase(self, r, current):
+        p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+        p.knownPreservedAsBase()
 
-    def relayKnownPreservedAsKnownPreserved(self, r, current=None):
-        r.knownPreservedAsKnownPreserved()
+    def relayKnownPreservedAsKnownPreserved(self, r, current):
+        p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+        p.knownPreservedAsKnownPreserved()
 
     def unknownPreservedAsBase(self, current=None):
         ex = Test.SPreserved2()
@@ -145,11 +147,13 @@ class TestI(Test.TestIntf):
         ex.p2 = ex.p1
         raise ex
 
-    def relayUnknownPreservedAsBase(self, r, current=None):
-        r.unknownPreservedAsBase()
+    def relayUnknownPreservedAsBase(self, r, current):
+        p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+        p.unknownPreservedAsBase()
 
-    def relayUnknownPreservedAsKnownPreserved(self, r, current=None):
-        r.unknownPreservedAsKnownPreserved()
+    def relayUnknownPreservedAsKnownPreserved(self, r, current):
+        p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+        p.unknownPreservedAsKnownPreserved()
 
 def run(args, communicator):
     properties = communicator.getProperties()
diff --git a/python/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py
index 8c0513cc4e8..9f04f121ad0 100755
--- a/python/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/python/test/Ice/slicing/exceptions/ServerAMD.py
@@ -154,19 +154,21 @@ class TestI(Test.TestIntf):
         f.set_exception(ex)
         return f
 
-    def relayKnownPreservedAsBase(self, r, current=None):
+    def relayKnownPreservedAsBase(self, r, current):
         f = Ice.Future()
         try:
-            r.knownPreservedAsBase()
+            p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+            p.knownPreservedAsBase()
             test(False)
         except Ice.Exception as ex:
             f.set_exception(ex)
         return f
 
-    def relayKnownPreservedAsKnownPreserved(self, r, current=None):
+    def relayKnownPreservedAsKnownPreserved(self, r, current):
         f = Ice.Future()
         try:
-            r.knownPreservedAsKnownPreserved()
+            p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+            p.knownPreservedAsKnownPreserved()
             test(False)
         except Ice.Exception as ex:
             f.set_exception(ex)
@@ -194,19 +196,21 @@ class TestI(Test.TestIntf):
         f.set_exception(ex)
         return f
 
-    def relayUnknownPreservedAsBase(self, r, current=None):
+    def relayUnknownPreservedAsBase(self, r, current):
         f = Ice.Future()
         try:
-            r.unknownPreservedAsBase()
+            p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+            p.unknownPreservedAsBase()
             test(False)
         except Ice.Exception as ex:
             f.set_exception(ex)
         return f
 
-    def relayUnknownPreservedAsKnownPreserved(self, r, current=None):
+    def relayUnknownPreservedAsKnownPreserved(self, r, current):
         f = Ice.Future()
         try:
-            r.unknownPreservedAsKnownPreserved()
+            p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
+            p.unknownPreservedAsKnownPreserved()
             test(False)
         except Ice.Exception as ex:
             f.set_exception(ex)