From 6a7d28c0f8c107baf376eceb9fc05d9e80bf74e5 Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Thu, 4 Apr 2013 13:08:32 -0400 Subject: object-storage: use tox for unit tests; fix em too Add the ability to use tox for unit tests, since it helps us solve the problem of supporting multiple branches that require different versions of dependencies, and allows us to possibly support multiple versions of python in the future. Also fix the code to work with pre-grizzly environments, by not requiring the constraints backport. Also fixed the xattr support to work with both pyxattr and xattr modules. And fixed the ring tests to also work without a live /etc/swift directory. BUG: 948657 (https://bugzilla.redhat.com/show_bug.cgi?id=948657) Change-Id: I2be79c8ef8916bb6552ef957094f9186a963a068 Signed-off-by: Peter Portante Reviewed-on: http://review.gluster.org/4781 Reviewed-by: Alex Wheeler Tested-by: Alex Wheeler Reviewed-by: Anand Avati --- .gitignore | 2 + ufo/bin/gluster-swift-gen-builders | 4 +- ufo/gluster/swift/common/constraints.py | 15 +++-- ufo/gluster/swift/common/utils.py | 14 ++-- ufo/test/unit/common/data/README.rings | 3 + ufo/test/unit/common/data/account.builder | Bin 0 -> 537 bytes ufo/test/unit/common/data/account.ring.gz | Bin 0 -> 183 bytes .../common/data/backups/1365124498.account.builder | Bin 0 -> 537 bytes .../data/backups/1365124498.container.builder | Bin 0 -> 537 bytes .../common/data/backups/1365124498.object.builder | Bin 0 -> 228 bytes .../common/data/backups/1365124499.object.builder | Bin 0 -> 537 bytes ufo/test/unit/common/data/container.builder | Bin 0 -> 537 bytes ufo/test/unit/common/data/container.ring.gz | Bin 0 -> 185 bytes ufo/test/unit/common/data/object.builder | Bin 0 -> 537 bytes ufo/test/unit/common/data/object.ring.gz | Bin 0 -> 182 bytes ufo/test/unit/common/test_ring.py | 74 +++++++-------------- ufo/test/unit/common/test_utils.py | 24 +++---- ufo/tools/test-requires | 6 ++ ufo/tox.ini | 25 +++++++ 19 files changed, 91 insertions(+), 76 deletions(-) create mode 100644 ufo/test/unit/common/data/README.rings create mode 100644 ufo/test/unit/common/data/account.builder create mode 100644 ufo/test/unit/common/data/account.ring.gz create mode 100644 ufo/test/unit/common/data/backups/1365124498.account.builder create mode 100644 ufo/test/unit/common/data/backups/1365124498.container.builder create mode 100644 ufo/test/unit/common/data/backups/1365124498.object.builder create mode 100644 ufo/test/unit/common/data/backups/1365124499.object.builder create mode 100644 ufo/test/unit/common/data/container.builder create mode 100644 ufo/test/unit/common/data/container.ring.gz create mode 100644 ufo/test/unit/common/data/object.builder create mode 100644 ufo/test/unit/common/data/object.ring.gz create mode 100644 ufo/tools/test-requires create mode 100644 ufo/tox.ini diff --git a/.gitignore b/.gitignore index 3056ad8c6a6..bac9ab97d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ Makefile stamp-h1 # Generated files +ufo/.tox +ufo/test/unit/.coverage contrib/uuid/uuid_types.h extras/init.d/glusterd.plist extras/init.d/glusterd-Debian diff --git a/ufo/bin/gluster-swift-gen-builders b/ufo/bin/gluster-swift-gen-builders index 37ed50dc302..bef5d1493de 100755 --- a/ufo/bin/gluster-swift-gen-builders +++ b/ufo/bin/gluster-swift-gen-builders @@ -35,8 +35,8 @@ do zone=1 for volname in $@ do - add $builder_file $zone ${port[$builder_file]} $volname - zone=$(expr $zone + 1) + add $builder_file $zone ${port[$builder_file]} $volname + zone=$(expr $zone + 1) done rebalance $builder_file diff --git a/ufo/gluster/swift/common/constraints.py b/ufo/gluster/swift/common/constraints.py index dd8662a9d43..11f626bb98e 100644 --- a/ufo/gluster/swift/common/constraints.py +++ b/ufo/gluster/swift/common/constraints.py @@ -13,15 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -from webob.exc import HTTPBadRequest - +try: + from webob.exc import HTTPBadRequest +except ImportError: + from swift.common.swob import HTTPBadRequest import swift.common.constraints import swift.common.ring as _ring from gluster.swift.common import Glusterfs, ring - -MAX_OBJECT_NAME_COMPONENT_LENGTH = swift.common.constraints.constraints_conf_int( - 'max_object_name_component_length', 255) +if hasattr(swift.common.constraints, 'constraints_conf_int'): + MAX_OBJECT_NAME_COMPONENT_LENGTH = \ + swift.common.constraints.constraints_conf_int( + 'max_object_name_component_length', 255) +else: + MAX_OBJECT_NAME_COMPONENT_LENGTH = 255 def validate_obj_name_component(obj): if len(obj) > MAX_OBJECT_NAME_COMPONENT_LENGTH: diff --git a/ufo/gluster/swift/common/utils.py b/ufo/gluster/swift/common/utils.py index a8e50081268..7e9f8a60f74 100644 --- a/ufo/gluster/swift/common/utils.py +++ b/ufo/gluster/swift/common/utils.py @@ -70,7 +70,7 @@ def read_metadata(path): key = 0 while metadata is None: try: - metadata_s += xattr.get(path, '%s%s' % (METADATA_KEY, (key or ''))) + metadata_s += xattr.getxattr(path, '%s%s' % (METADATA_KEY, (key or ''))) except IOError as err: if err.errno == errno.ENODATA: if key > 0: @@ -86,7 +86,7 @@ def read_metadata(path): # to the caller we have no metadata. metadata = {} else: - logging.exception("xattr.get failed on %s key %s err: %s", + logging.exception("xattr.getxattr failed on %s key %s err: %s", path, key, str(err)) # Note that we don't touch the keys on errors fetching the # data since it could be a transient state. @@ -120,9 +120,9 @@ def write_metadata(path, metadata): key = 0 while metastr: try: - xattr.set(path, '%s%s' % (METADATA_KEY, key or ''), metastr[:MAX_XATTR_SIZE]) + xattr.setxattr(path, '%s%s' % (METADATA_KEY, key or ''), metastr[:MAX_XATTR_SIZE]) except IOError as err: - logging.exception("xattr.set failed on %s key %s err: %s", path, key, str(err)) + logging.exception("setxattr failed on %s key %s err: %s", path, key, str(err)) raise metastr = metastr[MAX_XATTR_SIZE:] key += 1 @@ -131,7 +131,7 @@ def clean_metadata(path): key = 0 while True: try: - xattr.remove(path, '%s%s' % (METADATA_KEY, (key or ''))) + xattr.removexattr(path, '%s%s' % (METADATA_KEY, (key or ''))) except IOError as err: if err.errno == errno.ENODATA: break @@ -142,12 +142,12 @@ def check_user_xattr(path): if not os_path.exists(path): return False try: - xattr.set(path, 'user.test.key1', 'value1') + xattr.setxattr(path, 'user.test.key1', 'value1') except IOError as err: logging.exception("check_user_xattr: set failed on %s err: %s", path, str(err)) raise try: - xattr.remove(path, 'user.test.key1') + xattr.removexattr(path, 'user.test.key1') except IOError as err: logging.exception("check_user_xattr: remove failed on %s err: %s", path, str(err)) #Remove xattr may fail in case of concurrent remove. diff --git a/ufo/test/unit/common/data/README.rings b/ufo/test/unit/common/data/README.rings new file mode 100644 index 00000000000..6457501fb38 --- /dev/null +++ b/ufo/test/unit/common/data/README.rings @@ -0,0 +1,3 @@ +The unit tests expect certain ring data built using the following command: + + ../../../../bin/gluster-swift-gen-builders test iops \ No newline at end of file diff --git a/ufo/test/unit/common/data/account.builder b/ufo/test/unit/common/data/account.builder new file mode 100644 index 00000000000..090ba4b74ff Binary files /dev/null and b/ufo/test/unit/common/data/account.builder differ diff --git a/ufo/test/unit/common/data/account.ring.gz b/ufo/test/unit/common/data/account.ring.gz new file mode 100644 index 00000000000..6d4c8547437 Binary files /dev/null and b/ufo/test/unit/common/data/account.ring.gz differ diff --git a/ufo/test/unit/common/data/backups/1365124498.account.builder b/ufo/test/unit/common/data/backups/1365124498.account.builder new file mode 100644 index 00000000000..090ba4b74ff Binary files /dev/null and b/ufo/test/unit/common/data/backups/1365124498.account.builder differ diff --git a/ufo/test/unit/common/data/backups/1365124498.container.builder b/ufo/test/unit/common/data/backups/1365124498.container.builder new file mode 100644 index 00000000000..733d27dd9e3 Binary files /dev/null and b/ufo/test/unit/common/data/backups/1365124498.container.builder differ diff --git a/ufo/test/unit/common/data/backups/1365124498.object.builder b/ufo/test/unit/common/data/backups/1365124498.object.builder new file mode 100644 index 00000000000..ff877ec957d Binary files /dev/null and b/ufo/test/unit/common/data/backups/1365124498.object.builder differ diff --git a/ufo/test/unit/common/data/backups/1365124499.object.builder b/ufo/test/unit/common/data/backups/1365124499.object.builder new file mode 100644 index 00000000000..8b8cd6c1e34 Binary files /dev/null and b/ufo/test/unit/common/data/backups/1365124499.object.builder differ diff --git a/ufo/test/unit/common/data/container.builder b/ufo/test/unit/common/data/container.builder new file mode 100644 index 00000000000..733d27dd9e3 Binary files /dev/null and b/ufo/test/unit/common/data/container.builder differ diff --git a/ufo/test/unit/common/data/container.ring.gz b/ufo/test/unit/common/data/container.ring.gz new file mode 100644 index 00000000000..592b84bab9f Binary files /dev/null and b/ufo/test/unit/common/data/container.ring.gz differ diff --git a/ufo/test/unit/common/data/object.builder b/ufo/test/unit/common/data/object.builder new file mode 100644 index 00000000000..8b8cd6c1e34 Binary files /dev/null and b/ufo/test/unit/common/data/object.builder differ diff --git a/ufo/test/unit/common/data/object.ring.gz b/ufo/test/unit/common/data/object.ring.gz new file mode 100644 index 00000000000..d2f7192b6ce Binary files /dev/null and b/ufo/test/unit/common/data/object.ring.gz differ diff --git a/ufo/test/unit/common/test_ring.py b/ufo/test/unit/common/test_ring.py index 48ed9520b81..8b7509ccea8 100644 --- a/ufo/test/unit/common/test_ring.py +++ b/ufo/test/unit/common/test_ring.py @@ -13,69 +13,43 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os import unittest import gluster.swift.common.constraints -from gluster.swift.common.ring import * -from gluster.swift.common.Glusterfs import SWIFT_DIR +import swift.common.utils +from gluster.swift.common.ring import Ring -def _mock_ring_data(): - return [{'zone': 1, 'weight': 100.0, 'ip': '127.0.0.1', 'port': 6012, \ - 'meta': '', 'device': 'test', 'id': 0}, - {'zone': 2, 'weight': 100.0, 'ip': '127.0.0.1', 'id': 1, \ - 'meta': '', 'device': 'iops', 'port': 6012}] class TestRing(unittest.TestCase): """ Tests for common.utils """ def setUp(self): - self.ring = Ring(SWIFT_DIR, ring_name='object') + swift.common.utils.HASH_PATH_SUFFIX = 'endcap' + swiftdir = os.path.join(os.getcwd(), "common", "data") + self.ring = Ring(swiftdir, ring_name='object') def test_first_device(self): - try: - __devs = self.ring._devs - self.ring._devs = _mock_ring_data() - - part, node = self.ring.get_nodes('test') - assert node[0]['device'] == 'test' - node = self.ring.get_part_nodes(0) - assert node[0]['device'] == 'test' - for node in self.ring.get_more_nodes(0): - assert node['device'] == 'volume_not_in_ring' - finally: - self.ring._devs = __devs + part, node = self.ring.get_nodes('test') + assert node[0]['device'] == 'test' + node = self.ring.get_part_nodes(0) + assert node[0]['device'] == 'test' + for node in self.ring.get_more_nodes(0): + assert node['device'] == 'volume_not_in_ring' def test_invalid_device(self): - try: - __devs = self.ring._devs - self.ring._devs = _mock_ring_data() - - part, node = self.ring.get_nodes('test2') - assert node[0]['device'] == 'volume_not_in_ring' - node = self.ring.get_part_nodes(0) - assert node[0]['device'] == 'volume_not_in_ring' - finally: - self.ring._devs = __devs + part, node = self.ring.get_nodes('test2') + assert node[0]['device'] == 'volume_not_in_ring' + node = self.ring.get_part_nodes(0) + assert node[0]['device'] == 'volume_not_in_ring' def test_second_device(self): - try: - __devs = self.ring._devs - self.ring._devs = _mock_ring_data() - - part, node = self.ring.get_nodes('iops') - assert node[0]['device'] == 'iops' - node = self.ring.get_part_nodes(0) - assert node[0]['device'] == 'iops' - for node in self.ring.get_more_nodes(0): - assert node['device'] == 'volume_not_in_ring' - finally: - self.ring._devs = __devs + part, node = self.ring.get_nodes('iops') + assert node[0]['device'] == 'iops' + node = self.ring.get_part_nodes(0) + assert node[0]['device'] == 'iops' + for node in self.ring.get_more_nodes(0): + assert node['device'] == 'volume_not_in_ring' def test_second_device_with_reseller_prefix(self): - try: - __devs = self.ring._devs - self.ring._devs = _mock_ring_data() - - part, node = self.ring.get_nodes('AUTH_iops') - assert node[0]['device'] == 'iops' - finally: - self.ring._devs = __devs + part, node = self.ring.get_nodes('AUTH_iops') + assert node[0]['device'] == 'iops' diff --git a/ufo/test/unit/common/test_utils.py b/ufo/test/unit/common/test_utils.py index dd89bd5e4ef..92ce9aef30f 100644 --- a/ufo/test/unit/common/test_utils.py +++ b/ufo/test/unit/common/test_utils.py @@ -41,7 +41,7 @@ _xattr_rem_err = {} def _xkey(path, key): return "%s:%s" % (path, key) -def _setxattr(path, key, value): +def _setxattr(path, key, value, *args, **kwargs): _xattr_op_cnt['set'] += 1 xkey = _xkey(path, key) if xkey in _xattr_set_err: @@ -51,7 +51,7 @@ def _setxattr(path, key, value): global _xattrs _xattrs[xkey] = value -def _getxattr(path, key): +def _getxattr(path, key, *args, **kwargs): _xattr_op_cnt['get'] += 1 xkey = _xkey(path, key) if xkey in _xattr_get_err: @@ -67,7 +67,7 @@ def _getxattr(path, key): raise e return ret_val -def _removexattr(path, key): +def _removexattr(path, key, *args, **kwargs): _xattr_op_cnt['remove'] += 1 xkey = _xkey(path, key) if xkey in _xattr_rem_err: @@ -93,20 +93,20 @@ def _initxattr(): _xattr_rem_err = {} # Save the current methods - global _xattr_set; _xattr_set = xattr.set - global _xattr_get; _xattr_get = xattr.get - global _xattr_remove; _xattr_remove = xattr.remove + global _xattr_set; _xattr_set = xattr.setxattr + global _xattr_get; _xattr_get = xattr.getxattr + global _xattr_remove; _xattr_remove = xattr.removexattr # Monkey patch the calls we use with our internal unit test versions - xattr.set = _setxattr - xattr.get = _getxattr - xattr.remove = _removexattr + xattr.setxattr = _setxattr + xattr.getxattr = _getxattr + xattr.removexattr = _removexattr def _destroyxattr(): # Restore the current methods just in case - global _xattr_set; xattr.set = _xattr_set - global _xattr_get; xattr.get = _xattr_get - global _xattr_remove; xattr.remove = _xattr_remove + global _xattr_set; xattr.setxattr = _xattr_set + global _xattr_get; xattr.getxattr = _xattr_get + global _xattr_remove; xattr.removexattr = _xattr_remove # Destroy the stored values and global _xattrs; _xattrs = None diff --git a/ufo/tools/test-requires b/ufo/tools/test-requires new file mode 100644 index 00000000000..ef8bf14bfb0 --- /dev/null +++ b/ufo/tools/test-requires @@ -0,0 +1,6 @@ +coverage +nose +nosexcover +openstack.nose_plugin +nosehtmloutput +mock>=0.8.0 diff --git a/ufo/tox.ini b/ufo/tox.ini new file mode 100644 index 00000000000..792bb417f36 --- /dev/null +++ b/ufo/tox.ini @@ -0,0 +1,25 @@ +[tox] +envlist = py26,py27 + +[testenv] +setenv = VIRTUAL_ENV={envdir} + NOSE_WITH_OPENSTACK=1 + NOSE_OPENSTACK_COLOR=1 + NOSE_OPENSTACK_RED=0.05 + NOSE_OPENSTACK_YELLOW=0.025 + NOSE_OPENSTACK_SHOW_ELAPSED=1 + NOSE_OPENSTACK_STDOUT=1 +deps = + https://launchpad.net/swift/grizzly/1.8.0/+download/swift-1.8.0.tar.gz + -r{toxinidir}/tools/test-requires +changedir = {toxinidir}/test/unit +commands = nosetests -v --exe --with-coverage --cover-package gluster --cover-erase {posargs} + +[tox:jenkins] +downloadcache = ~/cache/pip + +[testenv:cover] +setenv = NOSE_WITH_COVERAGE=1 + +[testenv:venv] +commands = {posargs} -- cgit