From 3861bcec945ede062fccd5a94ccc86a6bfc8e280 Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Wed, 28 Aug 2013 15:08:14 -0400 Subject: Depend only on OpenStack Swift 1.9.1 * The master branch is currently tracking the development version 1.9.1 of Havana OpenStack Swift. * Seems that we still have some settings which are not reset in the unit tests. This fix provides a guaranteed state for test_utils.py:TestUtils.test_get_container_details Change-Id: Ie32f49743301bfa493f70ed8a539fb6840f9f67b Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/5719 Reviewed-by: Peter Portante Tested-by: Peter Portante --- test/unit/common/test_utils.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test') diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py index 4aae4c3..9ac684a 100644 --- a/test/unit/common/test_utils.py +++ b/test/unit/common/test_utils.py @@ -587,8 +587,10 @@ class TestUtils(unittest.TestCase): def test_get_container_details(self): orig_cwd = os.getcwd() + __do_getsize = Glusterfs._do_getsize td = tempfile.mkdtemp() try: + Glusterfs._do_getsize = False tf = tarfile.open("common/data/container_tree.tar.bz2", "r:bz2") os.chdir(td) tf.extractall() @@ -610,6 +612,7 @@ class TestUtils(unittest.TestCase): full_dir3: os.path.getmtime(full_dir3), } finally: + Glusterfs._do_getsize = __do_getsize os.chdir(orig_cwd) shutil.rmtree(td) -- cgit