aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-14 07:11:13 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-14 07:12:21 +0200
commitf79e842601dc2fa909372d2f4e2274e52985b87e (patch)
tree46a1bd9a1edfc6692b30455faec0f8b6083089fc /functest/tests
parentcfc36026a5b08ff113cfe8cc08dde7fd197410a7 (diff)
Update get_openstack_version()
It takes Rocky maximum version into account. Change-Id: I55469de4a63f1f824222660130a20d7fd8fa42c3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 2098c49184b1c97b89b4d88dffa2e2a9b3571f04)
Diffstat (limited to 'functest/tests')
-rw-r--r--functest/tests/unit/utils/test_functest_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py
index 2b98267c4..ab90de595 100644
--- a/functest/tests/unit/utils/test_functest_utils.py
+++ b/functest/tests/unit/utils/test_functest_utils.py
@@ -261,7 +261,7 @@ class FunctestUtilsTesting(unittest.TestCase):
def test_openstack_version1(self, *args):
cloud = mock.Mock()
self.assertEqual(functest_utils.get_openstack_version(
- cloud), "Rocky or newer")
+ cloud), "Rocky")
args[0].assert_called_once_with(cloud)
@mock.patch('functest.utils.functest_utils.get_nova_version',
@@ -327,7 +327,7 @@ class FunctestUtilsTesting(unittest.TestCase):
def test_openstack_version10(self, *args):
cloud = mock.Mock()
self.assertEqual(
- functest_utils.get_openstack_version(cloud), "Rocky or newer")
+ functest_utils.get_openstack_version(cloud), "Master")
args[0].assert_called_once_with(cloud)
@mock.patch('functest.utils.functest_utils.get_nova_version',