openstack/zaqar
Code Issues Proposed changes

Merge "Don't skip pools' functional tests"

Browse Source
This commit is contained in:
Jenkins 2014-10-01 14:30:56 +00:00 committed by Gerrit Code Review
commit 346ccd1cb0
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/etc/functional-tests.conf
View File

@ -1,5 +1,6 @@
[DEFAULT] [DEFAULT]
# run_tests = True # run_tests = True
unreliable = True
[auth] [auth]
# auth_on = False # auth_on = False

1
tests/etc/functional-zaqar.conf
View File

@ -19,6 +19,7 @@ debug = True
# Facility to use. If unset defaults to LOG_USER. # Facility to use. If unset defaults to LOG_USER.
;syslog_log_facility = LOG_LOCAL0 ;syslog_log_facility = LOG_LOCAL0
unreliable = True
[drivers] [drivers]
# Transport driver module (e.g., wsgi, zmq) # Transport driver module (e.g., wsgi, zmq)

1
tests/etc/wsgi_mongodb_pooled.conf
View File

@ -1,5 +1,6 @@
[DEFAULT] [DEFAULT]
pooling = True pooling = True
admin_mode = True
[drivers] [drivers]
transport = wsgi transport = wsgi

11
tests/functional/wsgi/v1_1/test_pools.py
View File

@ -14,14 +14,17 @@
# limitations under the License. # limitations under the License.
import ddt import ddt
from zaqar import tests as testing
from zaqar.tests.functional import base from zaqar.tests.functional import base
from zaqar.tests.functional import helpers from zaqar.tests.functional import helpers
@ddt.ddt @ddt.ddt
@testing.requires_mongodb
class TestPools(base.V1_1FunctionalTestBase): class TestPools(base.V1_1FunctionalTestBase):
server_class = base.ZaqarServer server_class = base.ZaqarAdminServer
config_file = 'wsgi_mongodb_pooled.conf'
def setUp(self): def setUp(self):
super(TestPools, self).setUp() super(TestPools, self).setUp()
@ -32,16 +35,11 @@ class TestPools(base.V1_1FunctionalTestBase):
)) ))
self.cfg.zaqar.version = "v1.1" self.cfg.zaqar.version = "v1.1"
self.skipTest("NOT IMPLEMENTED")
self.headers = helpers.create_zaqar_headers(self.cfg) self.headers = helpers.create_zaqar_headers(self.cfg)
self.client.headers = self.headers self.client.headers = self.headers
self.client.set_base_url(self.pool_url) self.client.set_base_url(self.pool_url)
def tearDown(self):
super(TestPools, self).tearDown()
@ddt.data( @ddt.data(
{ {
'name': "newpool", 'name': "newpool",
@ -227,6 +225,7 @@ class TestPools(base.V1_1FunctionalTestBase):
) )
def test_insert_pool_bad_data(self, params): def test_insert_pool_bad_data(self, params):
"""Create pools with invalid names and weights. Assert 400.""" """Create pools with invalid names and weights. Assert 400."""
self.skip("FIXME: https://bugs.launchpad.net/zaqar/+bug/1373486")
doc = helpers.create_pool_body( doc = helpers.create_pool_body(
weight=params.get('weight', 10), weight=params.get('weight', 10),
uri=params.get('uri', "mongodb://127.0.0.1:27017") uri=params.get('uri', "mongodb://127.0.0.1:27017")