summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-02-07 10:02:45 -0800
committerMonty Taylor <mordred@inaugust.com>2012-02-09 10:29:16 -0800
commit508d090e463e15da3e5db17b0a4a04cab167aeba (patch)
tree50856c0751bfc278277c09718d07c6eecfb292c0 /tests
parenta9e10729737c33a4c29c409ec966ce64301383c7 (diff)
downloadoslo-508d090e463e15da3e5db17b0a4a04cab167aeba.tar.gz
oslo-508d090e463e15da3e5db17b0a4a04cab167aeba.tar.xz
oslo-508d090e463e15da3e5db17b0a4a04cab167aeba.zip
Add git changelog method.
Change-Id: I71d99f00b2154bf151a1521016118ba6bd088f79
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/test_setup.py33
-rw-r--r--tests/unit/test_utils.py7
2 files changed, 33 insertions, 7 deletions
diff --git a/tests/unit/test_setup.py b/tests/unit/test_setup.py
new file mode 100644
index 0000000..6a65b2d
--- /dev/null
+++ b/tests/unit/test_setup.py
@@ -0,0 +1,33 @@
+# 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
+from openstack.common import setup
+
+
+class UtilsTest(unittest.TestCase):
+
+ def test_str_dict_replace(self):
+ string = 'Johnnie T. Hozer'
+ mapping = {'T.': 'The'}
+ self.assertEqual('Johnnie The Hozer',
+ setup.canonicalize_emails(string, mapping))
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 45205e9..1e9f937 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -23,7 +23,6 @@ import mock
from openstack.common import exception
from openstack.common import utils
-from openstack.common import setup
class UtilsTest(unittest.TestCase):
@@ -108,12 +107,6 @@ class UtilsTest(unittest.TestCase):
self.assertEqual(skynet_self_aware_time,
utils.parse_isotime(skynet_self_aware_time_str))
- def test_str_dict_replace(self):
- string = 'Johnnie T. Hozer'
- mapping = {'T.': 'The'}
- self.assertEqual('Johnnie The Hozer',
- setup.str_dict_replace(string, mapping))
-
def test_utcnow(self):
utils.set_time_override(mock.sentinel.utcnow)
self.assertEqual(utils.utcnow(), mock.sentinel.utcnow)