Fix tests that fails since bug fix #490 (send renamed as notify)

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@491 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/master/tests/testMasterElectionHandler.py

@@ -194,14 +194,13 @@ server: 127.0.0.1:10023
 
     def checkCalledAbort(self, conn, packet_number=0):
         """Check the abort method has been called and an error packet has been sent"""
-        # sometimes we answer an error, sometimes we just send it
-        send_calls_len = len(conn.mockGetNamedCalls("send"))
+        # sometimes we answer an error, sometimes we just notify it
+        notify_calls_len = len(conn.mockGetNamedCalls("notify"))
         answer_calls_len = len(conn.mockGetNamedCalls('answer'))
-        self.assertEquals(send_calls_len + answer_calls_len, 1)
+        self.assertEquals(notify_calls_len + answer_calls_len, 1)
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
-        self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
-        if send_calls_len == 1:
-            call = conn.mockGetNamedCalls("send")[packet_number]
+        if notify_calls_len == 1:
+            call = conn.mockGetNamedCalls("notify")[packet_number]
         else:
             call = conn.mockGetNamedCalls("answer")[packet_number]
         packet = call.getParam(0)

neo/master/tests/testMasterRecoveryHandler.py

@@ -174,12 +174,12 @@ server: 127.0.0.1:10023
 
     def checkCalledAbort(self, conn, packet_number=0):
         """Check the abort method has been called and an error packet has been sent"""
-        send_calls_len = len(conn.mockGetNamedCalls("send"))
+        notify_calls_len = len(conn.mockGetNamedCalls("notify"))
         answer_calls_len = len(conn.mockGetNamedCalls('answer'))
-        self.assertEquals(send_calls_len + answer_calls_len, 1)
+        self.assertEquals(notify_calls_len + answer_calls_len, 1)
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
-        if send_calls_len == 1:
-            call = conn.mockGetNamedCalls("send")[packet_number]
+        if notify_calls_len == 1:
+            call = conn.mockGetNamedCalls("notify")[packet_number]
         else:
             call = conn.mockGetNamedCalls("answer")[packet_number]
         packet = call.getParam(0)

neo/master/tests/testMasterService.py

@@ -119,12 +119,12 @@ server: 127.0.0.1:10023
     # Method to test the kind of packet returned in answer
     def checkCalledAbort(self, conn, packet_number=0):
         """Check the abort method has been called and an error packet has been sent"""
-        # sometimes we answer an error, sometimes we just send it
-        send_calls_len = len(conn.mockGetNamedCalls("send"))
+        # sometimes we answer an error, sometimes we just notify it
+        notify_calls_len = len(conn.mockGetNamedCalls("notify"))
         answer_calls_len = len(conn.mockGetNamedCalls('answer'))
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
-        if send_calls_len == 1:
-            call = conn.mockGetNamedCalls("send")[packet_number]
+        if notify_calls_len == 1:
+            call = conn.mockGetNamedCalls("notify")[packet_number]
         else:
             call = conn.mockGetNamedCalls("answer")[packet_number]
         packet = call.getParam(0)

neo/master/tests/testMasterVerificationHandler.py

@@ -178,12 +178,12 @@ server: 127.0.0.1:10023
     def checkCalledAbort(self, conn, packet_number=0):
         """Check the abort method has been called and an error packet has been sent"""
         # sometimes we answer an error, sometimes we just send it
-        send_calls_len = len(conn.mockGetNamedCalls("send"))
+        notify_calls_len = len(conn.mockGetNamedCalls("notify"))
         answer_calls_len = len(conn.mockGetNamedCalls('answer'))
-        self.assertEquals(send_calls_len + answer_calls_len, 1)
+        self.assertEquals(notify_calls_len + answer_calls_len, 1)
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
-        if send_calls_len == 1:
-            call = conn.mockGetNamedCalls("send")[packet_number]
+        if notify_calls_len == 1:
+            call = conn.mockGetNamedCalls("notify")[packet_number]
         else:
             call = conn.mockGetNamedCalls("answer")[packet_number]
         packet = call.getParam(0)

neo/storage/tests/testStorageBootstrapHandler.py

@@ -121,14 +121,14 @@ server: 127.0.0.1:10020
 
     def checkCalledAbort(self, conn, packet_number=0):
         """Check the abort method has been called and an error packet has been sent"""
-        # sometimes we answer an error, sometimes we just send it
-        send_calls_len = len(conn.mockGetNamedCalls("send"))
+        # sometimes we answer an error, sometimes we just notify it
+        notify_calls_len = len(conn.mockGetNamedCalls("notify"))
         answer_calls_len = len(conn.mockGetNamedCalls('answer'))
-        self.assertEquals(send_calls_len + answer_calls_len, 1)
+        self.assertEquals(notify_calls_len + answer_calls_len, 1)
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
         self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0)
-        if send_calls_len == 1:
-            call = conn.mockGetNamedCalls("send")[packet_number]
+        if notify_calls_len == 1:
+            call = conn.mockGetNamedCalls("notify")[packet_number]
         else:
             call = conn.mockGetNamedCalls("answer")[packet_number]
         packet = call.getParam(0)

neo/storage/tests/testStorageOperation.py

@@ -53,13 +53,13 @@ class StorageOperationTests(unittest.TestCase):
     def checkCalledAbort(self, conn, packet_number=0):
         """Check the abort method has been called and an error packet has been sent"""
         # sometimes we answer an error, sometimes we just send it
-        send_calls_len = len(conn.mockGetNamedCalls("send"))
+        notify_calls_len = len(conn.mockGetNamedCalls("notify"))
         answer_calls_len = len(conn.mockGetNamedCalls('answer'))
-        self.assertEquals(send_calls_len + answer_calls_len, 1)
+        self.assertEquals(notify_calls_len + answer_calls_len, 1)
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
         self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0)
-        if send_calls_len == 1:
-            call = conn.mockGetNamedCalls("send")[packet_number]
+        if notify_calls_len == 1:
+            call = conn.mockGetNamedCalls("notify")[packet_number]
         else:
             call = conn.mockGetNamedCalls("answer")[packet_number]
         packet = call.getParam(0)

neo/storage/tests/testStorageVerificationHandler.py

@@ -129,14 +129,14 @@ server: 127.0.0.1:10020
 
     def checkCalledAbort(self, conn, packet_number=0):
         """Check the abort method has been called and an error packet has been sent"""
-        # sometimes we answer an error, sometimes we just send it
-        send_calls_len = len(conn.mockGetNamedCalls("send"))
+        # sometimes we answer an error, sometimes we just notify it
+        notify_calls_len = len(conn.mockGetNamedCalls("notify"))
         answer_calls_len = len(conn.mockGetNamedCalls('answer'))
-        self.assertEquals(send_calls_len + answer_calls_len, 1)
+        self.assertEquals(notify_calls_len + answer_calls_len, 1)
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 1)
         self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0)
-        if send_calls_len == 1:
-            call = conn.mockGetNamedCalls("send")[packet_number]
+        if notify_calls_len == 1:
+            call = conn.mockGetNamedCalls("notify")[packet_number]
         else:
             call = conn.mockGetNamedCalls("answer")[packet_number]
         packet = call.getParam(0)