diff --git a/tests/common.py b/tests/common.py index 9f51f7b595e..116898dc7ef 100644 --- a/tests/common.py +++ b/tests/common.py @@ -23,6 +23,7 @@ object_proxy_60 = None common_proxy_61 = None db_proxy_61 = None model_proxy_61 = None +model_uri_61 = None def setUpModule(): """ @@ -46,13 +47,13 @@ def setUpModule(): global common_proxy_61 global db_proxy_61 global model_proxy_61 + global model_uri_61 # Use the new (6.1) API. - url = 'http://%s:%d/openerp/6.1/xmlrpc/' % (HOST, PORT) - common_proxy_61 = xmlrpclib.ServerProxy(url + 'common') - db_proxy_61 = xmlrpclib.ServerProxy(url + 'db') - model_proxy_61 = xmlrpclib.ServerProxy(url + 'model/' + DB) - + model_uri_61 = 'http://%s:%d/openerp/xmlrpc/1/' % (HOST, PORT) + common_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'common') + db_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'db') + model_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'model/' + DB) # Ugly way to ensure the server is listening. time.sleep(2) diff --git a/tests/test_xmlrpc.py b/tests/test_xmlrpc.py index 5cace01c9a9..4ad530cbeda 100644 --- a/tests/test_xmlrpc.py +++ b/tests/test_xmlrpc.py @@ -54,9 +54,11 @@ class test_xmlrpc(unittest2.TestCase): def test_xmlrpc_61_ir_model_search(self): """ Try a search on the object service. """ - ids = common.model_proxy_61.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', []) + + proxy = xmlrpclib.ServerProxy(common.model_uri_61 + 'model/' + DB + '/ir.model') + ids = proxy.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'search', []) assert ids - ids = common.model_proxy_61.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [], {}) + ids = proxy.execute(ADMIN_USER_ID, ADMIN_PASSWORD, 'search', [], {}) assert ids if __name__ == '__main__':