From eed3a9fc0bf490bef2e1c7cc597db6063c11bcac Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Wed, 9 Nov 2016 09:38:08 +0800 Subject: Merge func to utils Local test is ok. JIRA: QTIP-131 Change-Id: I7009337903c7ded90dda47a05d6c1c95aa96815d Signed-off-by: wu.zhihui --- tests/ansible_api_test.py | 2 +- tests/args_handler_test.py | 16 ++++++++-------- tests/create_zones_test.py | 16 ++++++++-------- tests/data/test.retry | 1 + tests/driver_test.py | 6 +++--- tests/env_setup_test.py | 4 +--- tests/spawn_vm_test.py | 10 +++++----- 7 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 tests/data/test.retry (limited to 'tests') diff --git a/tests/ansible_api_test.py b/tests/ansible_api_test.py index 613d5f7e..a259c422 100644 --- a/tests/ansible_api_test.py +++ b/tests/ansible_api_test.py @@ -6,7 +6,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -from func.ansible_api import AnsibleApi +from utils.ansible_api import AnsibleApi class TestClass: diff --git a/tests/args_handler_test.py b/tests/args_handler_test.py index a5c2223f..625a42f5 100644 --- a/tests/args_handler_test.py +++ b/tests/args_handler_test.py @@ -8,7 +8,7 @@ ############################################################################## import pytest import mock -import func.args_handler +import utils.args_handler class TestClass: @@ -20,16 +20,16 @@ class TestClass: [('duration', 20), ('protocol', 'tcp'), ('bandwidthGbps', 10)], [("10.20.0.24", [None]), ("10.20.0.23", [None])], {}]) ]) - @mock.patch('func.args_handler.Env_setup.call_ping_test') - @mock.patch('func.args_handler.Env_setup.call_ssh_test') - @mock.patch('func.args_handler.Env_setup.update_ansible') - @mock.patch('func.args_handler.SpawnVM') - @mock.patch('func.args_handler.Driver.drive_bench') + @mock.patch('utils.args_handler.Env_setup.call_ping_test') + @mock.patch('utils.args_handler.Env_setup.call_ssh_test') + @mock.patch('utils.args_handler.Env_setup.update_ansible') + @mock.patch('utils.args_handler.SpawnVM') + @mock.patch('utils.args_handler.Driver.drive_bench') def test_prepare_and_run_benchmark_successful(self, mock_driver, mock_sqawn_vm, mock_env_setup_ping, mock_env_setup_ssh, mock_update_ansible, test_input, expected): mock_ips = mock.Mock(return_value=["10.20.0.23", "10.20.0.24"]) - func.args_handler.Env_setup.fetch_compute_ips = mock_ips - func.args_handler.prepare_and_run_benchmark(test_input[0], test_input[1], test_input[2]) + utils.args_handler.Env_setup.fetch_compute_ips = mock_ips + utils.args_handler.prepare_and_run_benchmark(test_input[0], test_input[1], test_input[2]) call = mock_driver.call_args call_args, call_kwargs = call assert sorted(map(sorted, call_args)) == sorted(map(sorted, expected)) diff --git a/tests/create_zones_test.py b/tests/create_zones_test.py index 39e71c17..0f57581d 100644 --- a/tests/create_zones_test.py +++ b/tests/create_zones_test.py @@ -2,7 +2,7 @@ import pytest import mock from mock import Mock, MagicMock import os -from func.create_zones import AvailabilityZone +from utils.create_zones import AvailabilityZone return_list = [] @@ -61,9 +61,9 @@ class TestClass: ['create:compute1:compute1', 'add_host:compute1:10.20.0.4']), ]) - @mock.patch('func.create_zones.client', autospec=True) - @mock.patch('func.create_zones.v2', autospec=True) - @mock.patch('func.create_zones.session') + @mock.patch('utils.create_zones.client', autospec=True) + @mock.patch('utils.create_zones.v2', autospec=True) + @mock.patch('utils.create_zones.session') def test_create_zones_success(self, mock_keystone_session, mock_keystone_v2, mock_nova_client, test_input, expected, capfd): nova_obj = NovaMock() mock_nova_client.Client.return_value = nova_obj() @@ -73,7 +73,7 @@ class TestClass: 'OS_TENANT_NAME': 'admin'}) k.start() azone = AvailabilityZone() - azone.create_agg(test_input) + azone.create_aggs(test_input) k.stop() resout, reserr = capfd.readouterr() for x in expected: @@ -88,9 +88,9 @@ class TestClass: ([], []), ]) - @mock.patch('func.create_zones.client', autospec=True) - @mock.patch('func.create_zones.v2', autospec=True) - @mock.patch('func.create_zones.session') + @mock.patch('utils.create_zones.client', autospec=True) + @mock.patch('utils.create_zones.v2', autospec=True) + @mock.patch('utils.create_zones.session') def test_clean_all_aggregates(self, mock_keystone_session, mock_keystone_v2, mock_nova_client, test_input, expected, capfd): global return_list return_list = test_input diff --git a/tests/data/test.retry b/tests/data/test.retry new file mode 100644 index 00000000..7b9ad531 --- /dev/null +++ b/tests/data/test.retry @@ -0,0 +1 @@ +127.0.0.1 diff --git a/tests/driver_test.py b/tests/driver_test.py index 41a7dee4..d3025bd2 100644 --- a/tests/driver_test.py +++ b/tests/driver_test.py @@ -1,6 +1,6 @@ import pytest import mock -from func.driver import Driver +from utils.driver import Driver from os.path import expanduser HOME_DIR = expanduser('~') @@ -65,8 +65,8 @@ class TestClass: 'bandwidthGbps': 0, "role": "2-host"}]) ]) - @mock.patch('func.driver.AnsibleApi.execute_playbook') - @mock.patch('func.driver.AnsibleApi.get_detail_playbook_stats') + @mock.patch('utils.driver.AnsibleApi.execute_playbook') + @mock.patch('utils.driver.AnsibleApi.get_detail_playbook_stats') def test_driver_success(self, mock_stats, mock_ansible, test_input, expected): mock_ansible.return_value = True mock_stats.return_value = [(u'10.20.6.14', {'unreachable': 0, diff --git a/tests/env_setup_test.py b/tests/env_setup_test.py index a0bbf640..07f426e1 100644 --- a/tests/env_setup_test.py +++ b/tests/env_setup_test.py @@ -9,7 +9,7 @@ import pytest import filecmp -from func.env_setup import Env_setup +from utils.env_setup import Env_setup import mock @@ -38,8 +38,6 @@ class TestClass: 'no_proxy': 'localhost,127.0.0.1,10.20.*,192.168.*'}]) ]) def test_parse_success(self, test_input, expected): - print (test_input) - print (expected) test_class = Env_setup() mock_ips = mock.Mock(return_value=["10.20.0.28", "10.20.0.29"]) test_class.fetch_compute_ips = mock_ips diff --git a/tests/spawn_vm_test.py b/tests/spawn_vm_test.py index fca7dd00..c0d87cac 100644 --- a/tests/spawn_vm_test.py +++ b/tests/spawn_vm_test.py @@ -2,7 +2,7 @@ import pytest import mock from mock import Mock, MagicMock import os -from func.spawn_vm import SpawnVM +from utils.spawn_vm import SpawnVM class KeystoneMock(MagicMock): @@ -40,10 +40,10 @@ class TestClass: 'role': ['1-server', '2-host']}, [('172.10.0.154', '')]), ]) - @mock.patch('func.spawn_vm.Env_setup') - @mock.patch('func.spawn_vm.AvailabilityZone') - @mock.patch('func.spawn_vm.keystoneclient.v2_0', autospec=True) - @mock.patch('func.spawn_vm.heatclient.client', autospec=True) + @mock.patch('utils.spawn_vm.Env_setup') + @mock.patch('utils.spawn_vm.AvailabilityZone') + @mock.patch('utils.spawn_vm.keystoneclient.v2_0', autospec=True) + @mock.patch('utils.spawn_vm.heatclient.client', autospec=True) def test_create_zones_success(self, mock_heat, mock_keystone, mock_zone, mock_setup, test_input, expected): open('./config/QtipKey.pub', 'a').close() -- cgit 1.2.3-korg