diff options
author | xudan <xudan16@huawei.com> | 2019-11-13 03:32:24 -0500 |
---|---|---|
committer | Dan Xu <xudan16@huawei.com> | 2019-11-19 10:57:03 +0000 |
commit | 88dee82da16683c7796036ae6e20a2d7c1f6b162 (patch) | |
tree | d82bb8ead2c4b8bdfe66d817e9159c90f1a6fb6a /dovetail/tests/unit/test_test_runner.py | |
parent | b88e2328f7960d88aa979d01ad6ba6f06519b899 (diff) |
Fix exception when running HA tests without pod.yaml
1. use volumes '-v' to map files/directories which may be non-existing
2. use mounts '--mount' to map files/directories which couldn't be non-existing
JIRA: DOVETAIL-789
Change-Id: I2184e5baed3d1491a2df4d3a1a77a11e3e9b4fc8
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/tests/unit/test_test_runner.py')
-rw-r--r-- | dovetail/tests/unit/test_test_runner.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dovetail/tests/unit/test_test_runner.py b/dovetail/tests/unit/test_test_runner.py index 3cb27536..232de7b1 100644 --- a/dovetail/tests/unit/test_test_runner.py +++ b/dovetail/tests/unit/test_test_runner.py @@ -107,7 +107,7 @@ class TestRunnerTesting(unittest.TestCase): docker_img_obj = Mock() container_obj.get_docker_image.return_value = docker_img_obj container_obj.pull_image.return_value = True - container_obj.create.return_value = False + container_obj.create.return_value = [None, 'error'] mock_container.return_value = container_obj docker_runner.run() @@ -116,8 +116,8 @@ class TestRunnerTesting(unittest.TestCase): container_obj.get_docker_image.assert_called_once_with() container_obj.pull_image.assert_called_once_with(docker_img_obj) container_obj.create.assert_called_once_with(docker_img_obj) - docker_runner.logger.error.assert_called_once_with( - 'Failed to create container.') + docker_runner.logger.error.assert_has_calls([ + call('Failed to create container.'), call('error')]) @patch('dovetail.test_runner.dt_utils') @patch('dovetail.test_runner.dt_cfg') @@ -137,7 +137,8 @@ class TestRunnerTesting(unittest.TestCase): container_obj.get_docker_image.return_value = docker_img_obj container_obj.pull_image.return_value = True container_id = '12345' - container_obj.create.return_value = container_id + container_msg = 'Successfully to create container.' + container_obj.create.return_value = [container_id, container_msg] mock_container.return_value = container_obj self.testcase.pre_condition.return_value = ['cmd'] self.testcase.prepare_cmd.return_value = False @@ -180,7 +181,8 @@ class TestRunnerTesting(unittest.TestCase): container_obj.get_docker_image.return_value = docker_img_obj container_obj.pull_image.return_value = True container_id = '12345' - container_obj.create.return_value = container_id + container_msg = 'Successfully to create container.' + container_obj.create.return_value = [container_id, container_msg] mock_container.return_value = container_obj self.testcase.pre_condition.return_value = ['cmd'] self.testcase.prepare_cmd.return_value = True |