merging IceBridge into master

1 files changed, 13 insertions, 13 deletions

diff --git a/python/test/Ice/binding/AllTests.py b/python/test/Ice/binding/AllTests.py
index b877fc78ac5..5bf5a02a801 100644
--- a/python/test/Ice/binding/AllTests.py
+++ b/python/test/Ice/binding/AllTests.py
@@ -110,7 +110,7 @@ def allTests(communicator):
         name = test1.getAdapterName()
         if names.count(name) > 0:
             names.remove(name)
-        test1.ice_getConnection().close(False)
+        test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     #
     # Ensure that the proxy correctly caches the connection (we
@@ -128,7 +128,7 @@ def allTests(communicator):
     test(i == nRetry)
 
     for a in adapters:
-        a.getTestIntf().ice_getConnection().close(False)
+        a.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     #
     # Deactivate an adapter and ensure that we can still
@@ -152,7 +152,7 @@ def allTests(communicator):
         name = test1.getAdapterName()
         if names.count(name) > 0:
             names.remove(name)
-        test1.ice_getConnection().close(False)
+        test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     #
     # Deactivate an adapter and ensure that we can still
@@ -194,7 +194,7 @@ def allTests(communicator):
         name = getAdapterNameWithAMI(test1)
         if names.count(name) > 0:
             names.remove(name)
-        test1.ice_getConnection().close(False)
+        test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     #
     # Ensure that the proxy correctly caches the connection (we
@@ -212,7 +212,7 @@ def allTests(communicator):
     test(i == nRetry)
 
     for a in adapters:
-        a.getTestIntf().ice_getConnection().close(False)
+        a.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     #
     # Deactivate an adapter and ensure that we can still
@@ -236,7 +236,7 @@ def allTests(communicator):
         name = getAdapterNameWithAMI(test1)
         if names.count(name) > 0:
             names.remove(name)
-        test1.ice_getConnection().close(False)
+        test1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     #
     # Deactivate an adapter and ensure that we can still
@@ -266,7 +266,7 @@ def allTests(communicator):
         name = t.getAdapterName()
         if names.count(name) > 0:
             names.remove(name)
-        t.ice_getConnection().close(False)
+        t.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     t = Test.TestIntfPrx.uncheckedCast(t.ice_endpointSelection(Ice.EndpointSelectionType.Random))
     test(t.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random)
@@ -278,7 +278,7 @@ def allTests(communicator):
         name = t.getAdapterName()
         if names.count(name) > 0:
             names.remove(name)
-        t.ice_getConnection().close(False)
+        t.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
     deactivate(com, adapters)
 
@@ -337,13 +337,13 @@ def allTests(communicator):
     while i < nRetry and t.getAdapterName() == "Adapter36":
         i = i + 1
     test(i == nRetry)
-    t.ice_getConnection().close(False)
+    t.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
     adapters.append(com.createObjectAdapter("Adapter35", endpoints[1].toString()))
     i = 0
     while i < nRetry and t.getAdapterName() == "Adapter35":
         i = i + 1
     test(i == nRetry)
-    t.ice_getConnection().close(False)
+    t.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
     adapters.append(com.createObjectAdapter("Adapter34", endpoints[0].toString()))
     i = 0
     while i < nRetry and t.getAdapterName() == "Adapter34":
@@ -618,7 +618,7 @@ def allTests(communicator):
         t = createTestIntfPrx(adapters)
         for i in range(0, 5):
             test(t.getAdapterName() == "Adapter82")
-            t.ice_getConnection().close(False)
+            t.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
         testSecure = Test.TestIntfPrx.uncheckedCast(t.ice_secure(True))
         test(testSecure.ice_isSecure())
@@ -632,13 +632,13 @@ def allTests(communicator):
 
         for i in range(0, 5):
             test(t.getAdapterName() == "Adapter81")
-            t.ice_getConnection().close(False)
+            t.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
         com.createObjectAdapter("Adapter83", (t.ice_getEndpoints()[1]).toString()) # Reactive tcp OA.
 
         for i in range(0, 5):
             test(t.getAdapterName() == "Adapter83")
-            t.ice_getConnection().close(False)
+            t.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait)
 
         com.deactivateObjectAdapter(adapters[0])
         try: