Merge rmq test into base test for new merged case

cropsinsilico · Feb 1, 2019 · e674b62 · e674b62
1 parent 8e1dec6
commit e674b62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cis_interface/communication/tests/test_CommBase.py b/cis_interface/communication/tests/test_CommBase.py
@@ -203,6 +203,9 @@ def test_send_recv_after_close(self):
         close returns false."""
         self.send_instance.open()
         self.recv_instance.open()
+        if self.comm in ['RMQComm', 'RMQAsyncComm']:
+            self.send_instance.bind()
+            self.recv_instance.bind()
         self.send_instance.close()
         self.recv_instance.close()
         assert(self.send_instance.is_closed)

diff --git a/cis_interface/communication/tests/test_RMQComm.py b/cis_interface/communication/tests/test_RMQComm.py
@@ -14,12 +14,6 @@ class TestRMQComm(test_AsyncComm.TestAsyncComm):
     timeout = 10.0
     attr_list = (copy.deepcopy(test_AsyncComm.TestAsyncComm.attr_list)
                  + ['connection', 'channel'])
-
-    def test_double_open(self):
-        r"""test that opening/binding twice dosn't cause errors."""
-        super(TestRMQComm, self).test_double_open()
-        self.send_instance.bind()
-        self.recv_instance.bind()
 
 
 @unittest.skipIf(_rmq_server_running, "RMQ Server running")