diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-12 10:10:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-12 10:10:42 +0000 |
| commit | d371e80815957a670377e9d348796714a1ae037c (patch) | |
| tree | 2287ee00a68152c8eaf04d9676279de19b3abc09 /tests | |
| parent | bd1e5a3350305cd6554ba3b0d537d670bf6b4a75 (diff) | |
| parent | 7ee9613600db879abff65da48e6e7293b4c4c659 (diff) | |
| download | oslo-d371e80815957a670377e9d348796714a1ae037c.tar.gz oslo-d371e80815957a670377e9d348796714a1ae037c.tar.xz oslo-d371e80815957a670377e9d348796714a1ae037c.zip | |
Merge "Simplify version processing."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/test_version.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py index c67ccde..99c11f5 100644 --- a/tests/unit/test_version.py +++ b/tests/unit/test_version.py @@ -1,6 +1,7 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Red Hat, Inc. +# Copyright 2012-2013 Hewlett-Packard Development Company, L.P. # # 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 @@ -44,7 +45,7 @@ class DeferredVersionTestCase(BaseTestCase): def test_cached_version(self): class MyVersionInfo(version.VersionInfo): - def _generate_version(self): + def _get_version_from_pkg_resources(self): return "5.5.5.5" deferred_string = MyVersionInfo("openstack").\ @@ -54,7 +55,7 @@ class DeferredVersionTestCase(BaseTestCase): def test_print_cached_version(self): class MyVersionInfo(version.VersionInfo): - def _generate_version(self): + def _get_version_from_pkg_resources(self): return "5.5.5.5" deferred_string = MyVersionInfo("openstack")\ @@ -71,7 +72,7 @@ class DeferredVersionTestCase(BaseTestCase): my_version = "11111222223333344444555556666677777888889999900000" class MyVersionInfo(version.VersionInfo): - def _generate_version(self): + def _get_version_from_pkg_resources(self): return my_version deferred_string = MyVersionInfo("openstack")\ |