openstack/swift
Code Issues Proposed changes

tests: consolidate Namespace/ShardRange _check_name

Browse Source 
The Namespace class grew account/container properties to make them
easier to use in the proxy and subjected to similar consistency
requirements as the ShardRange's properties in the related change.

There are no new assertions added in this change, it merely
consolidates the py2/py3 validating helper which was duplicated
between the Namespace and ShardRange TestCases.

Related-Change-Id: Iebb09d6eff2165c25f80abca360210242cf3e6b7
Change-Id: Ide7f1dd3d9c664fb57c47dcd50edb44ae90ff5f9
This commit is contained in:
Clay Gerrard 2023-12-12 13:14:40 -06:00
parent 93f812a518
commit bcb8810886
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
test/unit/common/test_utils.py
View File

@ -7428,7 +7428,23 @@ class TestShardName(unittest.TestCase):
utils.ShardName.create('a', 'root', None, '1235678', 'bad') utils.ShardName.create('a', 'root', None, '1235678', 'bad')
class TestNamespace(unittest.TestCase): class BaseNamespaceShardRange(object):
def _check_name_account_container(self, nsr, exp_name):
# check that the name, account, container properties are consistent
exp_account, exp_container = exp_name.split('/')
if six.PY2:
self.assertEqual(exp_name.encode('utf8'), nsr.name)
self.assertEqual(exp_account.encode('utf8'), nsr.account)
self.assertEqual(exp_container.encode('utf8'), nsr.container)
else:
self.assertEqual(exp_name, nsr.name)
self.assertEqual(exp_account, nsr.account)
self.assertEqual(exp_container, nsr.container)
class TestNamespace(unittest.TestCase, BaseNamespaceShardRange):
def test_lower_setter(self): def test_lower_setter(self):
ns = utils.Namespace('a/c', 'b', '') ns = utils.Namespace('a/c', 'b', '')
# sanity checks # sanity checks
@ -7560,18 +7576,6 @@ class TestNamespace(unittest.TestCase):
self.assertEqual(exp_upper, ns.upper_str) self.assertEqual(exp_upper, ns.upper_str)
self.assertEqual(exp_upper + '\x00', ns.end_marker) self.assertEqual(exp_upper + '\x00', ns.end_marker)
def _check_name_account_container(self, ns, exp_name):
# check that the name, account, container properties are consistent
exp_account, exp_container = exp_name.split('/')
if six.PY2:
self.assertEqual(exp_name.encode('utf8'), ns.name)
self.assertEqual(exp_account.encode('utf8'), ns.account)
self.assertEqual(exp_container.encode('utf8'), ns.container)
else:
self.assertEqual(exp_name, ns.name)
self.assertEqual(exp_account, ns.account)
self.assertEqual(exp_container, ns.container)
def test_name(self): def test_name(self):
# constructor # constructor
path = 'a/c' path = 'a/c'
@ -7942,7 +7946,7 @@ class TestNamespaceBoundList(unittest.TestCase):
self.assertEqual(namespace_list.bounds, self.lowerbounds) self.assertEqual(namespace_list.bounds, self.lowerbounds)
class TestShardRange(unittest.TestCase): class TestShardRange(unittest.TestCase, BaseNamespaceShardRange):
def setUp(self): def setUp(self):
self.ts_iter = make_timestamp_iter() self.ts_iter = make_timestamp_iter()
@ -8181,18 +8185,6 @@ class TestShardRange(unittest.TestCase):
self._check_to_from_dict('l', 'u') self._check_to_from_dict('l', 'u')
self._check_to_from_dict('', '') self._check_to_from_dict('', '')
def _check_name_account_container(self, sr, exp_name):
# check that the name, account, container properties are consistent
exp_account, exp_container = exp_name.split('/')
if six.PY2:
self.assertEqual(exp_name.encode('utf8'), sr.name)
self.assertEqual(exp_account.encode('utf8'), sr.account)
self.assertEqual(exp_container.encode('utf8'), sr.container)
else:
self.assertEqual(exp_name, sr.name)
self.assertEqual(exp_account, sr.account)
self.assertEqual(exp_container, sr.container)
def test_name(self): def test_name(self):
# constructor # constructor
path = 'a/c' path = 'a/c'