SW-516: fixed test_storagequery_service_and_rpc for python3/qpid. Left the...

SW-516: fixed test_storagequery_service_and_rpc for python3/qpid. Left the test in its original state of incompleteness. At least it passes now (nothing is really tested).

SAS/DataManagement/StorageQueryService/test/test_storagequery_service_and_rpc.py

@@ -5,33 +5,17 @@ import uuid
 import datetime
 import logging
 from lofar.messaging import Service
+from lofar.messaging.messagebus import  TemporaryQueue
 from lofar.sas.datamanagement.storagequery.service import createService
 from lofar.sas.datamanagement.storagequery.rpc import StorageQueryRPC
 from lofar.sas.datamanagement.storagequery.cache import CacheManager
-from qpid.messaging.exceptions import *
 
-try:
-    from qpid.messaging import Connection
-    from qpidtoollibs import BrokerAgent
-except ImportError:
-    print('Cannot run test without qpid tools')
-    print('Please source qpid profile')
-    exit(3)
-
-connection = None
-broker = None
-
-try:
-    logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.INFO)
-    logger = logging.getLogger(__name__)
-
-    # setup broker connection
-    connection = Connection.establish('127.0.0.1')
-    broker = BrokerAgent(connection)
+logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.INFO)
+logger = logging.getLogger(__name__)
 
+with TemporaryQueue(__name__) as tmp_queue:
     # add test service busname
-    busname = 'test-lofarbus-%s' % (uuid.uuid1())
-    broker.addExchange('topic', busname)
+    busname = tmp_queue.address
 
     class TestCleanupServiceAndRPC(unittest.TestCase):
         def test(self):
@@ -45,13 +29,3 @@ try:
         #with createService(busname=busname, cache_manager=cache_manager):
             ## and run all tests
             #unittest.main()
-
-except ConnectError as ce:
-    logger.error(ce)
-    exit(3)
-finally:
-    # cleanup test bus and exit
-    if broker:
-        broker.delExchange(busname)
-    if connection:
-        connection.close()