From 2a216abcb466bd611b65070c3984e6b8adc9505f Mon Sep 17 00:00:00 2001 From: Joe Buck Date: Thu, 29 Aug 2013 15:37:15 -0700 Subject: [PATCH] Moving region_sync to utils Since other classes need to do syncs, let's move it to the utils file. Signed-off-by: Joe Buck Reviewed-by: Josh Durgin --- s3tests/functional/test_s3.py | 14 +------------- s3tests/functional/utils.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index 7747d71..c4f240b 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -31,6 +31,7 @@ from nose.plugins.attrib import attr from nose.plugins.skip import SkipTest from .utils import assert_raises +from .utils import region_sync_meta import AnonymousAuth from email.header import decode_header @@ -4611,19 +4612,6 @@ def test_region_bucket_create_secondary_access_remove_master(): conn.delete_bucket(bucket) -# syncs all the regions except for the one passed in -def region_sync_meta(targets, region): - - for (k, r) in targets.iteritems(): - if r == region: - continue - conf = r.conf - if conf.sync_agent_addr: - ret = requests.post('http://{addr}:{port}/metadata/incremental'.format(addr = conf.sync_agent_addr, port = conf.sync_agent_port)) - eq(ret.status_code, 200) - if conf.sync_meta_wait: - time.sleep(conf.sync_meta_wait) - @attr(resource='bucket') @attr(method='get') @attr(operation='create on one region, access in another') diff --git a/s3tests/functional/utils.py b/s3tests/functional/utils.py index 9398801..8852cfa 100644 --- a/s3tests/functional/utils.py +++ b/s3tests/functional/utils.py @@ -1,3 +1,8 @@ +import requests +import time + +from nose.tools import eq_ as eq + def assert_raises(excClass, callableObj, *args, **kwargs): """ Like unittest.TestCase.assertRaises, but returns the exception. @@ -12,3 +17,17 @@ def assert_raises(excClass, callableObj, *args, **kwargs): else: excName = str(excClass) raise AssertionError("%s not raised" % excName) + +# syncs all the regions except for the one passed in +def region_sync_meta(targets, region): + + for (k, r) in targets.iteritems(): + if r == region: + continue + conf = r.conf + if conf.sync_agent_addr: + ret = requests.post('http://{addr}:{port}/metadata/incremental'.format(addr = conf.sync_agent_addr, port = conf.sync_agent_port)) + eq(ret.status_code, 200) + if conf.sync_meta_wait: + time.sleep(conf.sync_meta_wait) +