dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

s3tests: only tun multiregion tests if configured

Browse source 
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2013-07-29 13:17:46 -07:00
parent 3b733245c5
commit 9954bc4470
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
s3tests/functional/test_s3.py
View file

@ -28,6 +28,7 @@ from urlparse import urlparse
from nose.tools import eq_ as eq from nose.tools import eq_ as eq
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from nose.plugins.skip import SkipTest
from .utils import assert_raises from .utils import assert_raises
import AnonymousAuth import AnonymousAuth
@ -4533,9 +4534,9 @@ def test_ranged_request_response_code():
eq(fetched_content, content[4:8]) eq(fetched_content, content[4:8])
eq(status, 206) eq(status, 206)
def assert_can_test_multiregion(): def check_can_test_multiregion():
not_eq(targets.main.master, None) if not targets.main.master or len(targets.main.secondaries) == 0:
not_eq(len(targets.main.secondaries), 0) raise SkipTest
@attr(resource='bucket') @attr(resource='bucket')
@attr(method='get') @attr(method='get')
@ -4543,7 +4544,7 @@ def assert_can_test_multiregion():
@attr(assertion='can\'t access in other region') @attr(assertion='can\'t access in other region')
@attr('multiregion') @attr('multiregion')
def test_region_bucket_create_secondary_access_remove_master(): def test_region_bucket_create_secondary_access_remove_master():
assert_can_test_multiregion() check_can_test_multiregion()
master_conn = targets.main.master.connection master_conn = targets.main.master.connection
@ -4579,7 +4580,7 @@ def region_sync_meta(targets, region):
@attr(assertion='can\'t access in other region') @attr(assertion='can\'t access in other region')
@attr('multiregion') @attr('multiregion')
def test_region_bucket_create_master_access_remove_secondary(): def test_region_bucket_create_master_access_remove_secondary():
assert_can_test_multiregion() check_can_test_multiregion()
master = targets.main.master master = targets.main.master
master_conn = master.connection master_conn = master.connection
@ -4604,7 +4605,7 @@ def test_region_bucket_create_master_access_remove_secondary():
@attr(assertion='can read object') @attr(assertion='can read object')
@attr('multiregion') @attr('multiregion')
def test_region_copy_object(): def test_region_copy_object():
assert_can_test_multiregion() check_can_test_multiregion()
for (k, dest) in targets.main.iteritems(): for (k, dest) in targets.main.iteritems():
dest_conn = dest.connection dest_conn = dest.connection