diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/driver_test.py | 6 | ||||
| -rw-r--r-- | tests/fetchimg_test.py | 34 | ||||
| -rw-r--r-- | tests/spawn_vm_test.py | 13 |
3 files changed, 4 insertions, 49 deletions
diff --git a/tests/driver_test.py b/tests/driver_test.py index 9162ca16..83c69c82 100644 --- a/tests/driver_test.py +++ b/tests/driver_test.py @@ -35,13 +35,13 @@ class TestClass: [('1-server', ['10.20.0.13']), ('2-host', ['10.20.0.15'])], "iperf_vm.yaml", [('duration', 20), ('protocol', 'tcp'), ('bandwidthGbps', 0)], - [("10.20.0.13", [None]), ("10.20.0.15", [None])], + [('1-server', '10.10.17.4'), ('2-host', '10.10.17.5')], {}], [{'Dest_dir': 'results', 'ip1': '10.20.0.13', 'ip2': '', 'installer': 'joid', - 'privateip1': 'NONE', + 'privateip1': '10.10.17.4', 'workingdir': '/home', 'fname': 'iperf_vm.yaml', 'username': 'ubuntu', @@ -53,7 +53,7 @@ class TestClass: 'ip1': '10.20.0.13', 'ip2': '', 'installer': 'joid', - 'privateip1': 'NONE', + 'privateip1': '10.10.17.4', 'workingdir': '/home', 'fname': 'iperf_vm.yaml', 'username': 'ubuntu', diff --git a/tests/fetchimg_test.py b/tests/fetchimg_test.py deleted file mode 100644 index 5d482567..00000000 --- a/tests/fetchimg_test.py +++ /dev/null @@ -1,34 +0,0 @@ -import mock -from func.fetchimg import FetchImg - - -class TestClass: - @mock.patch('func.fetchimg.os') - @mock.patch('func.fetchimg.os.path') - def test_fetch_img_success(self, mock_path, mock_os): - mock_os.system.return_value = True - mock_path.isfile.return_value = True - img = FetchImg() - img.download() - - @mock.patch('func.fetchimg.time') - @mock.patch('func.fetchimg.os.system') - @mock.patch('func.fetchimg.os.path') - def test_fetch_img_fail(self, mock_path, mock_system, mock_time): - img = FetchImg() - mock_system.return_value = True - mock_path.isfile.side_effect = [False, False, True] - img.download() - assert mock_time.sleep.call_count == 2 - - @mock.patch('func.fetchimg.time') - @mock.patch('func.fetchimg.os.system') - @mock.patch('func.fetchimg.os.path') - def test_fetch_temp_success(self, mock_path, mock_system, mock_time): - img = FetchImg() - mock_system.return_value = True - mock_path.isfile.side_effect = [True] - img.download() - filepath = './Temp_Img/QTIP_CentOS.qcow2' - imgstorepath = "/home/opnfv/imgstore/QTIP_CentOS.qcow2" - mock_system.assert_called_with("ln -s %s %s" % (imgstorepath, filepath)) diff --git a/tests/spawn_vm_test.py b/tests/spawn_vm_test.py index eb843ad9..b22745d7 100644 --- a/tests/spawn_vm_test.py +++ b/tests/spawn_vm_test.py @@ -10,15 +10,6 @@ class KeystoneMock(MagicMock): v2_0 = Mock() -class ImageMock(MagicMock): - name = 'QTIP_CentOS' - - -class ImagesMock(MagicMock): - def list(self): - return [ImageMock()] - - class StackMock(MagicMock): status = 'COMPLETE' outputs = [{'output_key': 'availability_instance_1', @@ -55,13 +46,11 @@ class TestClass: @mock.patch('func.spawn_vm.FetchImg') @mock.patch('func.spawn_vm.create_zones') @mock.patch('func.spawn_vm.client', autospec=True) - @mock.patch('func.spawn_vm.glanceclient', autospec=True) @mock.patch('func.spawn_vm.keystoneclient.v2_0', autospec=True) @mock.patch('func.spawn_vm.heatclient.client', autospec=True) - def test_create_zones_success(self, mock_heat, mock_keystone, mock_glance, + def test_create_zones_success(self, mock_heat, mock_keystone, mock_nova_client, mock_zone, mock_fetch, mock_setup, test_input, expected): - mock_glance.Client.return_value = Mock(images=ImagesMock()) mock_nova_client.Client.return_value = Mock() mock_heat.Client.return_value = Mock(stacks=HeatMock()) k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel'}) |