diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-12-17 12:17:59 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-12-19 18:54:17 +0000 |
| commit | 481d6ff142b8daeb08b22001997b5cf701a6d134 (patch) | |
| tree | 8b6f8fc1389817475bc4b7d7f596c6b505cd36dc /nova/tests | |
| parent | ba9ee7eb22ca17553e2e768365220c9a9838ae1d (diff) | |
Remove obsolete VCS version info completely
The VCS version string in nova/version.py has been hardcoded
to 'LOCALBRANCH:LOCALVERSION' since change
0bbb0e8cb1daa351af91cf97b2bcababfc0c7f9f
The only places which use this info are some logging calls,
and since 'nova-manager version' command. The latter would
more usefully output the distro specific package string.
Delete the VCS related methods in version.py and replace their
usage with a new method version_string_with_package() which
appends the distro-specific package tag
Change-Id: I972b79c329198cb5376d537c6b672830094cd759
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_versions.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nova/tests/test_versions.py b/nova/tests/test_versions.py index cec418aee..68e77ff9e 100644 --- a/nova/tests/test_versions.py +++ b/nova/tests/test_versions.py @@ -31,6 +31,7 @@ class VersionTestCase(test.TestCase): self.version.version_info = {'branch_nick': u'LOCALBRANCH', 'revision_id': 'LOCALREVISION', 'revno': 0} + self.version.NOVA_PACKAGE = "g9ec3421" def test_version_string_is_good(self): """Ensure version string works""" @@ -48,12 +49,7 @@ class VersionTestCase(test.TestCase): 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): + def test_version_string_with_package_is_good(self): """Ensure uninstalled code get version string""" - self.assertEqual("2012.10-LOCALBRANCH:LOCALREVISION", - self.version.version_string_with_vcs()) + self.assertEqual("2012.10-g9ec3421", + self.version.version_string_with_package()) |