SW-827: fixed t_rpc. BusListenerJanitor assures that the service queue is removed at end of test.

LCS/Messaging/python/messaging/test/t_RPC.py

@@ -11,7 +11,7 @@ import unittest
 import uuid
 from time import sleep
 
-from lofar.messaging.messagebus import TemporaryExchange, can_connect_to_broker, exchange_exists, queue_exists
+from lofar.messaging.messagebus import TemporaryExchange, can_connect_to_broker, exchange_exists, queue_exists, BusListenerJanitor
 from lofar.messaging.rpc import RPCClient, RPCService, RPCException, RPCTimeoutException, ServiceMessageHandler
 
 TEST_SERVICE_NAME = "%s.%s" % (__name__, uuid.uuid4())
@@ -47,12 +47,12 @@ class TestRPC(unittest.TestCase):
     def test_rpc_client_to_service_call(self):
         with TemporaryExchange(__name__) as tmp_exchange:
             tmp_exchange_address = tmp_exchange.address
-            with RPCService(TEST_SERVICE_NAME,
+            with BusListenerJanitor(RPCService(TEST_SERVICE_NAME,
                             handler_type=MyServiceMessageHandler,
                             handler_kwargs={'my_arg1': "foo",
                                             'my_arg2': "bar"},
                             exchange=tmp_exchange.address,
-                            num_threads=1) as service:
+                            num_threads=1)) as service:
                 service_queue_address = service.address
                 self.assertTrue(service.is_listening())
                 self.assertTrue(service.is_running())