Rename utils.py to strutils.py

Fixes bug #1083956

Change-Id: I681227e9428778adb7824a1930a33cfa5ffa13a1

2 files changed, 76 insertions, 76 deletions

diff --git a/tests/unit/test_strutils.py b/tests/unit/test_strutils.py
new file mode 100644
index 0000000..0eb5f5e
--- /dev/null
+++ b/tests/unit/test_strutils.py
@@ -0,0 +1,76 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import unittest
+
+import mock
+
+from openstack.common import exception
+from openstack.common import strutils
+
+
+class StrUtilsTest(unittest.TestCase):
+
+    def test_bool_bool_from_string(self):
+        self.assertTrue(strutils.bool_from_string(True))
+        self.assertFalse(strutils.bool_from_string(False))
+
+    def test_str_bool_from_string(self):
+        self.assertTrue(strutils.bool_from_string('true'))
+        self.assertTrue(strutils.bool_from_string('TRUE'))
+        self.assertTrue(strutils.bool_from_string('on'))
+        self.assertTrue(strutils.bool_from_string('On'))
+        self.assertTrue(strutils.bool_from_string('yes'))
+        self.assertTrue(strutils.bool_from_string('YES'))
+        self.assertTrue(strutils.bool_from_string('yEs'))
+        self.assertTrue(strutils.bool_from_string('1'))
+
+        self.assertFalse(strutils.bool_from_string('false'))
+        self.assertFalse(strutils.bool_from_string('FALSE'))
+        self.assertFalse(strutils.bool_from_string('off'))
+        self.assertFalse(strutils.bool_from_string('OFF'))
+        self.assertFalse(strutils.bool_from_string('no'))
+        self.assertFalse(strutils.bool_from_string('0'))
+        self.assertFalse(strutils.bool_from_string('42'))
+        self.assertFalse(strutils.bool_from_string('This should not be True'))
+
+    def test_unicode_bool_from_string(self):
+        self.assertTrue(strutils.bool_from_string(u'true'))
+        self.assertTrue(strutils.bool_from_string(u'TRUE'))
+        self.assertTrue(strutils.bool_from_string(u'on'))
+        self.assertTrue(strutils.bool_from_string(u'On'))
+        self.assertTrue(strutils.bool_from_string(u'yes'))
+        self.assertTrue(strutils.bool_from_string(u'YES'))
+        self.assertTrue(strutils.bool_from_string(u'yEs'))
+        self.assertTrue(strutils.bool_from_string(u'1'))
+
+        self.assertFalse(strutils.bool_from_string(u'false'))
+        self.assertFalse(strutils.bool_from_string(u'FALSE'))
+        self.assertFalse(strutils.bool_from_string(u'off'))
+        self.assertFalse(strutils.bool_from_string(u'OFF'))
+        self.assertFalse(strutils.bool_from_string(u'no'))
+        self.assertFalse(strutils.bool_from_string(u'NO'))
+        self.assertFalse(strutils.bool_from_string(u'0'))
+        self.assertFalse(strutils.bool_from_string(u'42'))
+        self.assertFalse(strutils.bool_from_string(u'This should not be True'))
+
+    def test_other_bool_from_string(self):
+        self.assertFalse(strutils.bool_from_string(mock.Mock()))
+
+    def test_int_from_bool_as_string(self):
+        self.assertEqual(1, strutils.int_from_bool_as_string(True))
+        self.assertEqual(0, strutils.int_from_bool_as_string(False))
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
deleted file mode 100644
index 82c5ff1..0000000
--- a/tests/unit/test_utils.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import unittest
-
-import mock
-
-from openstack.common import exception
-from openstack.common import utils
-
-
-class UtilsTest(unittest.TestCase):
-
-    def test_bool_bool_from_string(self):
-        self.assertTrue(utils.bool_from_string(True))
-        self.assertFalse(utils.bool_from_string(False))
-
-    def test_str_bool_from_string(self):
-        self.assertTrue(utils.bool_from_string('true'))
-        self.assertTrue(utils.bool_from_string('TRUE'))
-        self.assertTrue(utils.bool_from_string('on'))
-        self.assertTrue(utils.bool_from_string('On'))
-        self.assertTrue(utils.bool_from_string('yes'))
-        self.assertTrue(utils.bool_from_string('YES'))
-        self.assertTrue(utils.bool_from_string('yEs'))
-        self.assertTrue(utils.bool_from_string('1'))
-
-        self.assertFalse(utils.bool_from_string('false'))
-        self.assertFalse(utils.bool_from_string('FALSE'))
-        self.assertFalse(utils.bool_from_string('off'))
-        self.assertFalse(utils.bool_from_string('OFF'))
-        self.assertFalse(utils.bool_from_string('no'))
-        self.assertFalse(utils.bool_from_string('0'))
-        self.assertFalse(utils.bool_from_string('42'))
-        self.assertFalse(utils.bool_from_string('This should not be True'))
-
-    def test_unicode_bool_from_string(self):
-        self.assertTrue(utils.bool_from_string(u'true'))
-        self.assertTrue(utils.bool_from_string(u'TRUE'))
-        self.assertTrue(utils.bool_from_string(u'on'))
-        self.assertTrue(utils.bool_from_string(u'On'))
-        self.assertTrue(utils.bool_from_string(u'yes'))
-        self.assertTrue(utils.bool_from_string(u'YES'))
-        self.assertTrue(utils.bool_from_string(u'yEs'))
-        self.assertTrue(utils.bool_from_string(u'1'))
-
-        self.assertFalse(utils.bool_from_string(u'false'))
-        self.assertFalse(utils.bool_from_string(u'FALSE'))
-        self.assertFalse(utils.bool_from_string(u'off'))
-        self.assertFalse(utils.bool_from_string(u'OFF'))
-        self.assertFalse(utils.bool_from_string(u'no'))
-        self.assertFalse(utils.bool_from_string(u'NO'))
-        self.assertFalse(utils.bool_from_string(u'0'))
-        self.assertFalse(utils.bool_from_string(u'42'))
-        self.assertFalse(utils.bool_from_string(u'This should not be True'))
-
-    def test_other_bool_from_string(self):
-        self.assertFalse(utils.bool_from_string(mock.Mock()))
-
-    def test_int_from_bool_as_string(self):
-        self.assertEqual(1, utils.int_from_bool_as_string(True))
-        self.assertEqual(0, utils.int_from_bool_as_string(False))