diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-03 14:01:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-03 14:01:58 +0000 |
| commit | fceed501895107c1def893c38d88e435d81d5a12 (patch) | |
| tree | eb738a9d8290db3a886be5f68d3427a9e5b41031 | |
| parent | 5d490117cd31b5e11a5746d5124fb343f0749c02 (diff) | |
| parent | 795d1bcfd13aae2d07f52a2a1a51117e78a234c8 (diff) | |
| download | nova-fceed501895107c1def893c38d88e435d81d5a12.tar.gz nova-fceed501895107c1def893c38d88e435d81d5a12.tar.xz nova-fceed501895107c1def893c38d88e435d81d5a12.zip | |
Merge "Tweakify is_valid_boolstr()."
| -rw-r--r-- | nova/tests/test_utils.py | 13 | ||||
| -rw-r--r-- | nova/utils.py | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index 84d56cadf..5c5c226f9 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -463,6 +463,19 @@ class GenericUtilsTestCase(test.TestCase): h2 = hashlib.sha1(data).hexdigest() self.assertEquals(h1, h2) + def test_is_valid_boolstr(self): + self.assertTrue(utils.is_valid_boolstr('true')) + self.assertTrue(utils.is_valid_boolstr('false')) + self.assertTrue(utils.is_valid_boolstr('yes')) + self.assertTrue(utils.is_valid_boolstr('no')) + self.assertTrue(utils.is_valid_boolstr('y')) + self.assertTrue(utils.is_valid_boolstr('n')) + self.assertTrue(utils.is_valid_boolstr('1')) + self.assertTrue(utils.is_valid_boolstr('0')) + + self.assertFalse(utils.is_valid_boolstr('maybe')) + self.assertFalse(utils.is_valid_boolstr('only on tuesdays')) + class MonkeyPatchTestCase(test.TestCase): """Unit test for utils.monkey_patch().""" diff --git a/nova/utils.py b/nova/utils.py index cb75709ad..e4d708f5c 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -876,11 +876,8 @@ def is_int_like(val): def is_valid_boolstr(val): """Check if the provided string is a valid bool string or not.""" - val = str(val).lower() - return val == 'true' or val == 'false' or \ - val == 'yes' or val == 'no' or \ - val == 'y' or val == 'n' or \ - val == '1' or val == '0' + boolstrs = ('true', 'false', 'yes', 'no', 'y', 'n', '1', '0') + return str(val).lower() in boolstrs def is_valid_ipv4(address): |