diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-26 08:23:25 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-30 10:02:47 +0200 |
commit | 43d6672e637a5b5b68ac4c382140996b4b9b17da (patch) | |
tree | 78ec362612ff36d063aecaf955c391fcbe9d804e /functest/tests/unit/utils/test_functest_utils.py | |
parent | 780ca99c712cf6c94147bfc72095fba61768e74b (diff) |
Inherit rally from VmReady1
It also fixes clean().
Change-Id: I42d1305d5cdb5a717cfa7fce26798ac7102310f7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/tests/unit/utils/test_functest_utils.py')
-rw-r--r-- | functest/tests/unit/utils/test_functest_utils.py | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py index 7debcc1df..d35ed8ced 100644 --- a/functest/tests/unit/utils/test_functest_utils.py +++ b/functest/tests/unit/utils/test_functest_utils.py @@ -11,11 +11,9 @@ import logging import time -import os import unittest import mock -import munch import pkg_resources from functest.utils import functest_utils @@ -220,70 +218,6 @@ class FunctestUtilsTesting(unittest.TestCase): self.test_file), 'test_image_name') - def test_get_extnetwork_nocloud(self): - with self.assertRaises(AssertionError): - functest_utils.get_external_network(None) - - def test_get_extnetwork_env_ok1(self): - cloud = mock.Mock() - cloud.get_network.return_value = munch.Munch(name="dummy") - os.environ["EXTERNAL_NETWORK"] = 'dummy' - self.assertEqual( - functest_utils.get_external_network(cloud), - cloud.get_network.return_value) - cloud.get_network.assert_called_once_with( - 'dummy', {'router:external': True}) - cloud.list_networks.assert_not_called() - - def test_get_extnetwork_env_ok2(self): - cloud = mock.Mock() - cloud.get_network.return_value = None - cloud.list_networks.return_value = None - os.environ["EXTERNAL_NETWORK"] = 'dummy' - self.assertEqual(functest_utils.get_external_network(cloud), None) - cloud.get_network.assert_called_once_with( - 'dummy', {'router:external': True}) - cloud.list_networks.assert_called_once_with( - {'router:external': True}) - - def test_get_extnetwork_env_ko(self): - cloud = mock.Mock() - cloud.get_network.return_value = None - cloud.list_networks.return_value = [munch.Munch(name="dummy")] - os.environ["EXTERNAL_NETWORK"] = 'dummy' - self.assertEqual( - functest_utils.get_external_network(cloud), - cloud.list_networks.return_value[0]) - cloud.get_network.assert_called_once_with( - 'dummy', {'router:external': True}) - cloud.list_networks.assert_called_once_with( - {'router:external': True}) - - def test_get_extnetwork_noenv_ko(self): - try: - del os.environ["EXTERNAL_NETWORK"] - except Exception: # pylint: disable=broad-except - pass - cloud = mock.Mock() - cloud.list_networks.return_value = None - self.assertEqual(functest_utils.get_external_network(cloud), None) - cloud.get_network.assert_not_called() - cloud.list_networks.assert_called_once_with( - {'router:external': True}) - - def test_get_extnetwork_noenv_ok(self): - try: - del os.environ["EXTERNAL_NETWORK"] - except Exception: # pylint: disable=broad-except - pass - cloud = mock.Mock() - cloud.list_networks.return_value = [munch.Munch(name="dummy")] - self.assertEqual( - functest_utils.get_external_network(cloud), - cloud.list_networks.return_value[0]) - cloud.get_network.assert_not_called() - cloud.list_networks.assert_called_once_with( - {'router:external': True}) if __name__ == "__main__": logging.disable(logging.CRITICAL) |