Bug 3816 - removed timed waits from tests

1 files changed, 15 insertions, 19 deletions

diff --git a/py/test/Ice/slicing/exceptions/AllTests.py b/py/test/Ice/slicing/exceptions/AllTests.py
index 09bd5ab9443..79e09026355 100644
--- a/py/test/Ice/slicing/exceptions/AllTests.py
+++ b/py/test/Ice/slicing/exceptions/AllTests.py
@@ -26,12 +26,8 @@ class CallbackBase:
         self._cond.acquire()
         try:
             while not self._called:
-                self._cond.wait(5.0)
-            if self._called:
-                self._called = False
-                return True
-            else:
-                return False
+                self._cond.wait()
+            self._called = False
         finally:
             self._cond.release()
 
@@ -253,7 +249,7 @@ def allTests(communicator):
     print "base (AMI)... ",
     cb = AMI_Test_baseAsBaseI()
     t.baseAsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "slicing of unknown derived... ",
@@ -270,7 +266,7 @@ def allTests(communicator):
     print "slicing of unknown derived (AMI)... ",
     cb = AMI_Test_unknownDerivedAsBaseI()
     t.unknownDerivedAsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "non-slicing of known derived as base... ",
@@ -288,7 +284,7 @@ def allTests(communicator):
     print "non-slicing of known derived as base (AMI)... ",
     cb = AMI_Test_knownDerivedAsBaseI()
     t.knownDerivedAsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "non-slicing of known derived as derived... ",
@@ -306,7 +302,7 @@ def allTests(communicator):
     print "non-slicing of known derived as derived (AMI)... ",
     cb = AMI_Test_knownDerivedAsKnownDerivedI()
     t.knownDerivedAsKnownDerived_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "slicing of unknown intermediate as base... ",
@@ -323,7 +319,7 @@ def allTests(communicator):
     print "slicing of unknown intermediate as base (AMI)... ",
     cb = AMI_Test_unknownIntermediateAsBaseI()
     t.unknownIntermediateAsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "slicing of known intermediate as base... ",
@@ -341,7 +337,7 @@ def allTests(communicator):
     print "slicing of known intermediate as base (AMI)... ",
     cb = AMI_Test_knownIntermediateAsBaseI()
     t.knownIntermediateAsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "slicing of known most derived as base... ",
@@ -360,7 +356,7 @@ def allTests(communicator):
     print "slicing of known most derived as base (AMI)... ",
     cb = AMI_Test_knownMostDerivedAsBaseI()
     t.knownMostDerivedAsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "non-slicing of known intermediate as intermediate... ",
@@ -378,7 +374,7 @@ def allTests(communicator):
     print "non-slicing of known intermediate as intermediate (AMI)... ",
     cb = AMI_Test_knownIntermediateAsKnownIntermediateI()
     t.knownIntermediateAsKnownIntermediate_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "non-slicing of known most derived exception as intermediate... ",
@@ -397,7 +393,7 @@ def allTests(communicator):
     print "non-slicing of known most derived as intermediate (AMI)... ",
     cb = AMI_Test_knownMostDerivedAsKnownIntermediateI()
     t.knownMostDerivedAsKnownIntermediate_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "non-slicing of known most derived as most derived... ",
@@ -416,7 +412,7 @@ def allTests(communicator):
     print "non-slicing of known most derived as most derived (AMI)... ",
     cb = AMI_Test_knownMostDerivedAsKnownMostDerivedI()
     t.knownMostDerivedAsKnownMostDerived_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "slicing of unknown most derived, known intermediate as base... ",
@@ -434,7 +430,7 @@ def allTests(communicator):
     print "slicing of unknown most derived, known intermediate as base (AMI)... ",
     cb = AMI_Test_unknownMostDerived1AsBaseI()
     t.unknownMostDerived1AsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "slicing of unknown most derived, known intermediate as intermediate... ",
@@ -452,7 +448,7 @@ def allTests(communicator):
     print "slicing of unknown most derived, known intermediate as intermediate (AMI)... ",
     cb = AMI_Test_unknownMostDerived1AsKnownIntermediateI()
     t.unknownMostDerived1AsKnownIntermediate_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     print "slicing of unknown most derived, unknown intermediate as base... ",
@@ -469,7 +465,7 @@ def allTests(communicator):
     print "slicing of unknown most derived, unknown intermediate as base (AMI)... ",
     cb = AMI_Test_unknownMostDerived2AsBaseI()
     t.unknownMostDerived2AsBase_async(cb)
-    test(cb.check())
+    cb.check()
     print "ok"
 
     return t