diff options
author | 2018-02-09 16:11:38 +0000 | |
---|---|---|
committer | 2018-02-09 16:11:38 +0000 | |
commit | 8073104c142f7e005bba18c96999a11af745fd95 (patch) | |
tree | 6607b2f32318bb48f5fdb7abf7be7a1c7609be77 /functest/tests | |
parent | 17049b67f1085492d83837da99ca245174d40db5 (diff) | |
parent | eef1da6d59e47d7d82ce8ebed23fe2e75990fd72 (diff) |
Merge "Unlink run_tests from constants"
Diffstat (limited to 'functest/tests')
-rw-r--r-- | functest/tests/unit/ci/test_run_tests.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/functest/tests/unit/ci/test_run_tests.py b/functest/tests/unit/ci/test_run_tests.py index 0b89ce27..aaa265c5 100644 --- a/functest/tests/unit/ci/test_run_tests.py +++ b/functest/tests/unit/ci/test_run_tests.py @@ -14,7 +14,6 @@ import os import mock from functest.ci import run_tests -from functest.utils.constants import CONST from functest.core.testcase import TestCase @@ -177,7 +176,7 @@ class RunTestsTesting(unittest.TestCase): @mock.patch('functest.ci.run_tests.Runner.run_tier') @mock.patch('functest.ci.run_tests.Runner.summary') def test_run_all_default(self, *mock_methods): - CONST.__setattr__('CI_LOOP', 'test_ci_loop') + os.environ['CI_LOOP'] = 'test_ci_loop' self.runner.run_all() mock_methods[1].assert_not_called() self.assertTrue(mock_methods[2].called) @@ -185,7 +184,7 @@ class RunTestsTesting(unittest.TestCase): @mock.patch('functest.ci.run_tests.LOGGER.info') @mock.patch('functest.ci.run_tests.Runner.summary') def test_run_all_missing_tier(self, *mock_methods): - CONST.__setattr__('CI_LOOP', 'loop_re_not_available') + os.environ['CI_LOOP'] = 'loop_re_not_available' self.runner.run_all() self.assertTrue(mock_methods[1].called) @@ -200,8 +199,7 @@ class RunTestsTesting(unittest.TestCase): self.runner.tiers.configure_mock(**args) self.assertEqual(self.runner.main(**kwargs), run_tests.Result.EX_ERROR) - mock_methods[1].assert_called_once_with( - '/home/opnfv/functest/conf/env_file') + mock_methods[1].assert_called_once_with() @mock.patch('functest.ci.run_tests.Runner.source_envfile') @mock.patch('functest.ci.run_tests.Runner.run_test', @@ -250,7 +248,7 @@ class RunTestsTesting(unittest.TestCase): run_tests.Result.EX_OK) args[0].assert_called_once_with(None) args[1].assert_called_once_with() - args[2].assert_called_once_with('/home/opnfv/functest/conf/env_file') + args[2].assert_called_once_with() @mock.patch('functest.ci.run_tests.Runner.source_envfile') def test_main_any_tier_test_ko(self, *args): @@ -261,7 +259,7 @@ class RunTestsTesting(unittest.TestCase): self.assertEqual( self.runner.main(test='any', noclean=True, report=True), run_tests.Result.EX_ERROR) - args[0].assert_called_once_with('/home/opnfv/functest/conf/env_file') + args[0].assert_called_once_with() if __name__ == "__main__": |