aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests/unit/ci/test_run_tests.py
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-11-30 02:31:17 +0000
committerLinda Wang <wangwulin@huawei.com>2017-11-30 07:33:31 +0000
commit8b21d5190469230644506ec561762d452a46b933 (patch)
treea91f9083878a657915df8d84f93aba0eb5c1f7da /functest/tests/unit/ci/test_run_tests.py
parente63b856182cb65f1943f83b672e7d9e8b9f3dc3e (diff)
Stop updating test_db_url in config file by env var
If TEST_DB_URL is declared in env variable, use it before considering the var in config file. Change-Id: I656ad8765287c48d60af7ab88b421805d76fb231 Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/tests/unit/ci/test_run_tests.py')
-rw-r--r--functest/tests/unit/ci/test_run_tests.py34
1 files changed, 2 insertions, 32 deletions
diff --git a/functest/tests/unit/ci/test_run_tests.py b/functest/tests/unit/ci/test_run_tests.py
index fc689452..b5af18c9 100644
--- a/functest/tests/unit/ci/test_run_tests.py
+++ b/functest/tests/unit/ci/test_run_tests.py
@@ -7,7 +7,6 @@
import logging
import unittest
-import os
import mock
@@ -72,19 +71,9 @@ class RunTestsTesting(unittest.TestCase):
'openstack': {'image_name': 'test_image_name_3'}}}}
@mock.patch('functest.ci.run_tests.Runner.patch_file')
- @mock.patch('functest.ci.run_tests.Runner.update_db_url')
- def test_update_config_file_default(self, *mock_methods):
+ def test_update_config_file_default(self, mock_patch):
self.runner.update_config_file()
- mock_methods[1].assert_called()
- mock_methods[0].assert_not_called()
-
- @mock.patch('functest.ci.run_tests.Runner.patch_file')
- @mock.patch('functest.ci.run_tests.Runner.update_db_url')
- @mock.patch.dict(os.environ, {'TEST_DB_URL': 'somevalue'})
- def test_update_config_file_update_db(self, *mock_methods):
- self.runner.update_config_file()
- mock_methods[1].assert_called()
- mock_methods[0].assert_called()
+ mock_patch.assert_called()
def test_patch_file_missing_file(self):
patch_file_path = "unexisting_file"
@@ -119,25 +108,6 @@ class RunTestsTesting(unittest.TestCase):
mock_methods[1].assert_called()
mock_methods[0].assert_called()
- def test_update_db_url_missing_file(self):
- run_tests.CONFIG_FUNCTEST_PATH = "unexisting_file"
- with self.assertRaises(IOError):
- self.runner.update_db_url()
-
- @mock.patch('functest.ci.run_tests.yaml.safe_load')
- @mock.patch('functest.ci.run_tests.ft_utils.get_functest_yaml')
- @mock.patch.dict(os.environ, {'TEST_DB_URL': 'url2'})
- def test_update_db_url_default(self, *mock_methods):
- with mock.patch(
- 'six.moves.builtins.open', mock.mock_open()), mock.patch(
- 'functest.ci.run_tests.yaml.safe_load') as yaml1:
- yaml1.return_value = self.config_file_yaml
- self.runner.update_db_url()
- self.assertEqual(
- yaml1.return_value['results']['test_db_url'], 'url2')
- mock_methods[0].assert_not_called()
- mock_methods[1].assert_not_called()
-
@mock.patch('functest.ci.run_tests.logger.error')
def test_source_rc_file_missing_file(self, mock_logger_error):
with mock.patch('functest.ci.run_tests.os.path.isfile',