Merge lp:~ken-pepple/nova/lp828600 into lp:~hudson-openstack/nova/trunk

[Ken Pepple]

added unit tests for version.py

added unit tests for version.py (although not like soren asked) by adding test_versions.py

Is the correct copyright ? we used to do it this way (claim copyright by primary author) but most files I see now are just "copyright 2011 Openstack LLC" ... not important to me either way just wanting to follow the rules.

[Brian Waldon (bcwaldon)]

Good work, Ken.

review: Approve

[Alex Meade (alex-meade)]

review: Approve

[Trey Morris (tr3buchet)]

even more good stuff

review: Approve

=== added file 'nova/tests/test_versions.py'
--- nova/tests/test_versions.py	1970-01-01 00:00:00 +0000
+++ nova/tests/test_versions.py	2011-08-21 01:33:24 +0000
@@ -0,0 +1,61 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    Copyright 2011 Ken Pepple
+#
+#    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.
+
+
+from nova import exception
+from nova import test
+from nova import utils
+from nova import version
+
+
+class VersionTestCase(test.TestCase):
+    """Test cases for Versions code"""
+    def setUp(self):
+        """setup test with unchanging values"""
+        super(VersionTestCase, self).setUp()
+        self.version = version
+        self.version.FINAL = False
+        self.version.NOVA_VERSION = ['2012', '10']
+        self.version.YEAR, self.version.COUNT = self.version.NOVA_VERSION
+        self.version.version_info = {'branch_nick': u'LOCALBRANCH',
+                                    'revision_id': 'LOCALREVISION',
+                                    'revno': 0}
+
+    def test_version_string_is_good(self):
+        """Ensure version string works"""
+        self.assertEqual("2012.10-dev", self.version.version_string())
+
+    def test_canonical_version_string_is_good(self):
+        """Ensure canonical version works"""
+        self.assertEqual("2012.10", self.version.canonical_version_string())
+
+    def test_final_version_strings_are_identical(self):
+        """Ensure final version strings match only at release"""
+        self.assertNotEqual(self.version.canonical_version_string(),
+                        self.version.version_string())
+        self.version.FINAL = True
+        self.assertEqual(self.version.canonical_version_string(),
+                        self.version.version_string())
+
+    def test_vcs_version_string_is_good(self):
+        """Ensure uninstalled code generates local """
+        self.assertEqual("LOCALBRANCH:LOCALREVISION",
+                        self.version.vcs_version_string())
+
+    def test_version_string_with_vcs_is_good(self):
+        """Ensure uninstalled code get version string"""
+        self.assertEqual("2012.10-LOCALBRANCH:LOCALREVISION",
+                        self.version.version_string_with_vcs())