From 3861bcec945ede062fccd5a94ccc86a6bfc8e280 Mon Sep 17 00:00:00 2001
From: Luis Pabon <lpabon@redhat.com>
Date: Wed, 28 Aug 2013 15:08:14 -0400
Subject: [PATCH] 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 <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5719
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Peter Portante <pportant@redhat.com>
---
doc/markdown/dev_guide.md | 9 +++++++++
glusterfs-openstack-swift.spec | 10 +++++-----
test/unit/common/test_utils.py | 3 +++
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/doc/markdown/dev_guide.md b/doc/markdown/dev_guide.md
index 8181e4c..688adb6 100644
--- a/doc/markdown/dev_guide.md
+++ b/doc/markdown/dev_guide.md
@@ -135,6 +135,14 @@ one or more tests be added to the automated unit test suite. Unit
tests are available under the `test/unit` directory.
#### Functional Tests
+
+##### OpenStack Swift Havana Setup
+Currently, Havana OpenStack Swift is still under development. While
+currently there is no official release for Havana Swift, there is a
+yum repo with multiple Havana Swift RPM development releases available.
+Please refer to the following [README][] file for more information.
+
+##### Executing the tests
The automated functional tests only run on RPM based systems
like Fedora/CentOS, etc. To run the functional tests, the following
requirements must be met.
@@ -235,3 +243,4 @@ of the RPM:
[PEP8]: http://www.python.org/dev/peps/pep-0008
[Git Commit Messages]: https://wiki.openstack.org/wiki/GitCommitMessages
[GlusterFS Compiling RPMS]: https://forge.gluster.org/glusterfs-core/pages/CompilingRPMS
+[README]: http://repos.fedorapeople.org/repos/openstack/openstack-trunk/README
diff --git a/glusterfs-openstack-swift.spec b/glusterfs-openstack-swift.spec
index fd6a0a1..c41ddfd 100644
--- a/glusterfs-openstack-swift.spec
+++ b/glusterfs-openstack-swift.spec
@@ -39,11 +39,11 @@ BuildRequires: python-setuptools
Requires : memcached
Requires : openssl
Requires : python
-Requires : openstack-swift >= 1.9.1
-Requires : openstack-swift-account >= 1.9.1
-Requires : openstack-swift-container >= 1.9.1
-Requires : openstack-swift-object >= 1.9.1
-Requires : openstack-swift-proxy >= 1.9.1
+Requires : openstack-swift = 1.9.1
+Requires : openstack-swift-account = 1.9.1
+Requires : openstack-swift-container = 1.9.1
+Requires : openstack-swift-object = 1.9.1
+Requires : openstack-swift-proxy = 1.9.1
Obsoletes: glusterfs-swift-plugin
Obsoletes: glusterfs-swift
Obsoletes: glusterfs-ufo
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)