Merge "Some optimizations about unit test"

3 files changed, 26 insertions, 28 deletions

diff --git a/tests/unit/config/test_schemas.py b/tests/unit/config/test_schemas.py
index 7c7dab28..97bff208 100644
--- a/tests/unit/config/test_schemas.py
+++ b/tests/unit/config/test_schemas.py
@@ -21,16 +21,11 @@ def conf_file_dir(data_root):
     return os.path.join(data_root, 'lab_conf')
 
 
-@pytest.mark.parametrize('deploy_file_name', [
-    ('deploy_virtual1.yml'),
-    ('deploy_virtual_error.yml'),
-    ('deploy_baremetal.yml')])
-def test_deploy_schema_validate(conf_file_dir, deploy_file_name):
+@pytest.mark.parametrize('deploy_file_name, tell_result', [
+    ('deploy_virtual1.yml', lambda x: x == []),
+    ('deploy_virtual_error.yml', lambda x: x != []),
+    ('deploy_baremetal.yml', lambda x: x == [])])
+def test_deploy_schema_validate(conf_file_dir, deploy_file_name, tell_result):
     data = yaml.safe_load(open(os.path.join(conf_file_dir, deploy_file_name), 'r'))
     errors = deploy_schema_validate(data)
-    if deploy_file_name == 'deploy_virtual1.yml':
-        assert errors == []
-    elif deploy_file_name == 'deploy_virtual_error.yml':
-        assert errors != []
-    elif deploy_file_name == 'deploy_baremetal.yml':
-        assert errors == []
+    assert tell_result(errors)
diff --git a/tests/unit/prepare/test_prepare_execure.py b/tests/unit/prepare/test_prepare_execute.py
index 9e72722d..03259b93 100644
--- a/tests/unit/prepare/test_prepare_execure.py
+++ b/tests/unit/prepare/test_prepare_execute.py
@@ -21,7 +21,7 @@ deploy.prepare.execute.KOLLA_CONF_PATH = '/tmp'
 
 
 @pytest.fixture(scope="module")
-def kolla_conf_file_nov_path():
+def kolla_conf_file_nova_path():
     return os.path.join(deploy.prepare.execute.KOLLA_CONF_PATH, 'nova')
 
 
@@ -44,19 +44,19 @@ def clear_tmp_dir(path):
     os.rmdir(path)
 
 
-def test__set_qemu_compute(kolla_conf_file_nov_path):
+def test__set_qemu_compute(kolla_conf_file_nova_path):
     _set_qemu_compute()
-    exp_conf_file = os.path.join(kolla_conf_file_nov_path, 'nova-compute.conf')
+    exp_conf_file = os.path.join(kolla_conf_file_nova_path, 'nova-compute.conf')
     assert os.path.isfile(exp_conf_file)
-    clear_tmp_dir(kolla_conf_file_nov_path)
+    clear_tmp_dir(kolla_conf_file_nova_path)
 
 
-def test__set_default_floating_pool(kolla_conf_file_nov_path, conf_file_dir):
+def test__set_default_floating_pool(kolla_conf_file_nova_path, conf_file_dir):
     network_conf_file = os.path.join(conf_file_dir, 'network_virtual1.yml')
     _set_default_floating_pool(network_conf_file)
-    exp_conf_file = os.path.join(kolla_conf_file_nov_path, 'nova-api.conf')
+    exp_conf_file = os.path.join(kolla_conf_file_nova_path, 'nova-api.conf')
     assert os.path.isfile(exp_conf_file)
-    clear_tmp_dir(kolla_conf_file_nov_path)
+    clear_tmp_dir(kolla_conf_file_nova_path)
 
 
 def test__set_trusts_auth(kolla_conf_file_heat_dir):
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index d5cd6104..41a06f63 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -9,6 +9,7 @@
 import os
 import mock
 import pytest
+import mock
 
 from deploy import utils
 from deploy.utils import (
@@ -93,14 +94,16 @@ def test_confirm_dir_exists(tmpdir, test_dir_name):
 
 
 @pytest.mark.parametrize('scenario', [
-    ('os-nosdn-nofeature-ha'),
+    ('os-nosdn-nofeature-ha')])
+@mock.patch("deploy.utils.err_exit")
+def test_check_scenario_supported(mock_err_exit, scenario):
+    check_scenario_valid(scenario)
+    mock_err_exit.assert_not_called()
+
+
+@pytest.mark.parametrize('scenario', [
     ('os-odl-kvm-ha')])
-def test_check_scenario_valid(scenario):
-    try:
-        check_scenario_valid(scenario)
-    except SystemExit:
-        if scenario == 'os-nosdn-nofeature-ha':
-            assert 0
-    else:
-        if scenario == 'os-odl-kvm-ha':
-            assert 0
+@mock.patch("deploy.utils.err_exit")
+def test_check_scenario_unsupported(mock_err_exit, scenario):
+    check_scenario_valid(scenario)
+    mock_err_exit.assert_called_once()