From 2a3ba3a692169af140617ee17e48e8dda4b59441 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 24 Sep 2014 17:52:02 +0200 Subject: [PATCH] Don't skip pools' functional tests Change-Id: Ieaeb2be0a1c9ca4aaebd28231dcb420677836679 Closes-bug: #1348453 --- tests/etc/functional-tests.conf | 1 + tests/etc/functional-zaqar.conf | 1 + tests/etc/wsgi_mongodb_pooled.conf | 1 + tests/functional/wsgi/v1_1/test_pools.py | 11 +++++------ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/etc/functional-tests.conf b/tests/etc/functional-tests.conf index 8558f7fbc..c19d7dcf7 100644 --- a/tests/etc/functional-tests.conf +++ b/tests/etc/functional-tests.conf @@ -1,5 +1,6 @@ [DEFAULT] # run_tests = True +unreliable = True [auth] # auth_on = False diff --git a/tests/etc/functional-zaqar.conf b/tests/etc/functional-zaqar.conf index 613c37105..f2e16a770 100644 --- a/tests/etc/functional-zaqar.conf +++ b/tests/etc/functional-zaqar.conf @@ -19,6 +19,7 @@ debug = True # Facility to use. If unset defaults to LOG_USER. ;syslog_log_facility = LOG_LOCAL0 +unreliable = True [drivers] # Transport driver module (e.g., wsgi, zmq) diff --git a/tests/etc/wsgi_mongodb_pooled.conf b/tests/etc/wsgi_mongodb_pooled.conf index 7d5b64059..f9db7a314 100644 --- a/tests/etc/wsgi_mongodb_pooled.conf +++ b/tests/etc/wsgi_mongodb_pooled.conf @@ -1,5 +1,6 @@ [DEFAULT] pooling = True +admin_mode = True [drivers] transport = wsgi diff --git a/tests/functional/wsgi/v1_1/test_pools.py b/tests/functional/wsgi/v1_1/test_pools.py index 0afcad98a..853661d5b 100644 --- a/tests/functional/wsgi/v1_1/test_pools.py +++ b/tests/functional/wsgi/v1_1/test_pools.py @@ -14,14 +14,17 @@ # limitations under the License. import ddt +from zaqar import tests as testing from zaqar.tests.functional import base from zaqar.tests.functional import helpers @ddt.ddt +@testing.requires_mongodb class TestPools(base.V1_1FunctionalTestBase): - server_class = base.ZaqarServer + server_class = base.ZaqarAdminServer + config_file = 'wsgi_mongodb_pooled.conf' def setUp(self): super(TestPools, self).setUp() @@ -32,16 +35,11 @@ class TestPools(base.V1_1FunctionalTestBase): )) self.cfg.zaqar.version = "v1.1" - self.skipTest("NOT IMPLEMENTED") - self.headers = helpers.create_zaqar_headers(self.cfg) self.client.headers = self.headers self.client.set_base_url(self.pool_url) - def tearDown(self): - super(TestPools, self).tearDown() - @ddt.data( { 'name': "newpool", @@ -227,6 +225,7 @@ class TestPools(base.V1_1FunctionalTestBase): ) def test_insert_pool_bad_data(self, params): """Create pools with invalid names and weights. Assert 400.""" + self.skip("FIXME: https://bugs.launchpad.net/zaqar/+bug/1373486") doc = helpers.create_pool_body( weight=params.get('weight', 10), uri=params.get('uri', "mongodb://127.0.0.1:27017")