Fix ICE-7249 - Python Ice/objects cross test failure

2 files changed, 50 insertions, 2 deletions

diff --git a/python/test/Ice/objects/Test.ice b/python/test/Ice/objects/Test.ice
index d1061336e42..f52960ee953 100644
--- a/python/test/Ice/objects/Test.ice
+++ b/python/test/Ice/objects/Test.ice
@@ -57,7 +57,7 @@ class D
 {
     A theA;
     B theB;
-    C theC;    
+    C theC;
 
     bool preMarshalInvoked;
     bool postUnmarshalInvoked();
@@ -134,6 +134,36 @@ exception EDerived extends EBase
     A1 a4;
 };
 
+module Inner
+{
+
+class A
+{
+    ::Test::A theA;
+};
+
+exception Ex
+{
+    string reason;
+};
+
+module Sub
+{
+
+class A
+{
+    ::Test::Inner::A theA;
+};
+
+exception Ex
+{
+    string reason;
+};
+
+};
+
+};
+
 class Initial
 {
     void shutdown();
@@ -158,6 +188,12 @@ class Initial
     BaseSeq opBaseSeq(BaseSeq inSeq, out BaseSeq outSeq);
 
     Compact getCompact();
+
+    Inner::A getInnerA();
+    Inner::Sub::A getInnerSubA();
+
+    void throwInnerEx() throws Inner::Ex;
+    void throwInnerSubEx() throws Inner::Sub::Ex;
 };
 
 };
diff --git a/python/test/Ice/objects/TestI.py b/python/test/Ice/objects/TestI.py
index 0dc810b32ef..1c2763a1fa2 100644
--- a/python/test/Ice/objects/TestI.py
+++ b/python/test/Ice/objects/TestI.py
@@ -147,7 +147,7 @@ class InitialI(Test.Initial):
 
     def getH(self, current=None):
         return HI()
-    
+
     def getD1(self, d1, current=None):
         return d1
 
@@ -163,6 +163,18 @@ class InitialI(Test.Initial):
     def getCompact(self, current=None):
         return Test.CompactExt()
 
+    def getInnerA(self, current=None):
+        return Test.Inner.A(self._b1)
+
+    def getInnerSubA(self, current=None):
+        return Test.Inner.Sub.A(Test.Inner.A(self._b1))
+
+    def throwInnerEx(self, current=None):
+        raise Test.Inner.Ex("Inner::Ex")
+
+    def throwInnerSubEx(self, current=None):
+        raise Test.Inner.Sub.Ex("Inner::Sub::Ex")
+
 class UnexpectedObjectExceptionTestI(Test.UnexpectedObjectExceptionTest):
     def op(self, current=None):
         return Test.AlsoEmpty()