From 546375844a9f0d7dcb2f447896499a128b6dce6d Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Tue, 29 Aug 2017 09:56:40 +0800 Subject: [PATCH] Fix Py27/35 jenkins failure the newest pymongo lib break our CI, because that we did the circular reference for db table creation. This patch fixd the circular reference bug. Change-Id: Ie91b3c029776c6142d36d8a058fd96d2c4d75f6f --- zaqar/tests/unit/storage/base.py | 5 +++-- zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zaqar/tests/unit/storage/base.py b/zaqar/tests/unit/storage/base.py index 3f63521bc..c926c72e7 100644 --- a/zaqar/tests/unit/storage/base.py +++ b/zaqar/tests/unit/storage/base.py @@ -73,10 +73,11 @@ class ControllerBaseTest(testing.TestBase): db_name = "zaqar_test_pools_" + str(i) # NOTE(dynarro): we need to create a unique uri. - uri = "%s/%s" % (uri, db_name) + new_uri = "%s/%s" % (uri, db_name) options = {'database': db_name} self.control.pools_controller.create(six.text_type(i), - 100, uri, options=options) + 100, new_uri, + options=options) self.driver = self.driver_class(self.conf, cache, self.control) self.addCleanup(self.control.pools_controller.drop_all) self.addCleanup(self.control.catalogue_controller.drop_all) diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py index 59af85a5a..d7adcd35c 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py @@ -44,9 +44,9 @@ class TestMessagesMongoDB(base.V2Base): for i in range(4): db_name = "zaqar_test_pools_" + str(i) # NOTE(dynarro): we need to create a unique uri. - uri = "%s/%s" % (uri, db_name) + new_uri = "%s/%s" % (uri, db_name) options = {'database': db_name} - doc = {'weight': 100, 'uri': uri, 'options': options} + doc = {'weight': 100, 'uri': new_uri, 'options': options} self.simulate_put(self.url_prefix + '/pools/' + str(i), body=jsonutils.dumps(doc)) self.assertEqual(falcon.HTTP_201, self.srmock.status)