* Ruby port of sliced/compact/preserved

* Python clean up
* More changes to exceptions test

1 files changed, 32 insertions, 0 deletions

diff --git a/py/test/Ice/slicing/exceptions/Server.py b/py/test/Ice/slicing/exceptions/Server.py
index eb0c585a9b6..a880f12b335 100755
--- a/py/test/Ice/slicing/exceptions/Server.py
+++ b/py/test/Ice/slicing/exceptions/Server.py
@@ -107,12 +107,44 @@ class TestI(Test.TestIntf):
         umd2.umd2 = "UnknownMostDerived2.umd2"
         raise umd2
 
+    def knownPreservedAsBase(self, current=None):
+        ex = Test.KnownPreservedDerived()
+        ex.b = "base"
+        ex.kp = "preserved"
+        ex.kpd = "derived"
+        raise ex
+
+    def knownPreservedAsKnownPreserved(self, current=None):
+        ex = Test.KnownPreservedDerived()
+        ex.b = "base"
+        ex.kp = "preserved"
+        ex.kpd = "derived"
+        raise ex
+
     def relayKnownPreservedAsBase(self, r, current=None):
         r.knownPreservedAsBase()
 
     def relayKnownPreservedAsKnownPreserved(self, r, current=None):
         r.knownPreservedAsKnownPreserved()
 
+    def unknownPreservedAsBase(self, current=None):
+        ex = Test.SPreserved2()
+        ex.b = "base"
+        ex.kp = "preserved"
+        ex.kpd = "derived"
+        ex.p1 = Test.SPreservedClass("bc", "spc")
+        ex.p2 = ex.p1
+        raise ex
+
+    def unknownPreservedAsKnownPreserved(self, current=None):
+        ex = Test.SPreserved2()
+        ex.b = "base"
+        ex.kp = "preserved"
+        ex.kpd = "derived"
+        ex.p1 = Test.SPreservedClass("bc", "spc")
+        ex.p2 = ex.p1
+        raise ex
+
     def relayUnknownPreservedAsBase(self, r, current=None):
         r.unknownPreservedAsBase()