3 files changed, 1 insertions, 30 deletions
diff --git a/py/test/Ice/faultTolerance/AllTests.py b/py/test/Ice/faultTolerance/AllTests.py
index 8a60442f919..700740a2195 100644
--- a/py/test/Ice/faultTolerance/AllTests.py
+++ b/py/test/Ice/faultTolerance/AllTests.py
@@ -82,13 +82,6 @@ class AMI_Test_idempotentAbortI(AMI_Test_abortI):
     def ice_exception(self, ex):
         AMI_Test_abortI.ice_exception(self, ex)
 
-class AMI_Test_nonmutatingAbortI(AMI_Test_abortI):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, ex):
-        AMI_Test_abortI.ice_exception(self, ex)
-
 def allTests(communicator, ports):
     print "testing stringToProxy... ",
     ref = "test"
@@ -156,7 +149,7 @@ def allTests(communicator, ports):
                 obj.abort_async(cb)
                 test(cb.check())
                 print "ok"
-        elif j == 2:
+        elif j == 2 or j == 3:
             if not ami:
                 print "aborting server #%d and #%d with idempotent call... " % (i, i + 1),
                 try:
@@ -174,24 +167,6 @@ def allTests(communicator, ports):
                 print "ok"
 
             i = i + 1
-        elif j == 3:
-            if not ami:
-                print "aborting server #%d and #%d with nonmutating call... " % (i, i + 1),
-                try:
-                    obj.nonmutatingAbort()
-                    test(False)
-                except Ice.ConnectionLostException:
-                    print "ok"
-                except Ice.ConnectFailedException:
-                    print "ok"
-            else:
-                print "aborting server #%d and #%d with nonmutating AMI call... " % (i, i + 1),
-                cb = AMI_Test_nonmutatingAbortI()
-                obj.nonmutatingAbort_async(cb)
-                test(cb.check())
-                print "ok"
-
-            i = i + 1
         else:
             assert(False)
 
diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py
index 0364727cc7a..f36f9a81d19 100644
--- a/py/test/Ice/faultTolerance/Server.py
+++ b/py/test/Ice/faultTolerance/Server.py
@@ -41,9 +41,6 @@ class TestI(Test.TestIntf):
     def idempotentAbort(self, current=None):
         os._exit(0)
 
-    def nonmutatingAbort(self, current=None):
-        os._exit(0)
-
     def pid(self, current=None):
         return os.getpid()
 
diff --git a/py/test/Ice/faultTolerance/Test.ice b/py/test/Ice/faultTolerance/Test.ice
index b2470263e52..f07c5d508eb 100644
--- a/py/test/Ice/faultTolerance/Test.ice
+++ b/py/test/Ice/faultTolerance/Test.ice
@@ -18,7 +18,6 @@ module Test
     void shutdown();
     void abort();
     idempotent void idempotentAbort();
-    idempotent void nonmutatingAbort();
     idempotent int pid();
 };