diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml | 2 | ||||
| -rw-r--r-- | tests/unit/test_ssh.py | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml index 732d73af7..f5a2778e8 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml @@ -36,7 +36,7 @@ scenarios: context: name: yardstick-TC005 image: yardstick-image - flavor: m1.small + flavor: yardstick-flavor user: ubuntu servers: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml index 8b21c5bf1..7221518ab 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml @@ -16,7 +16,7 @@ scenarios: vlan_net_2_name: apexlake_outbound_network vlan_subnet_2_name: apexlake_outbound_subnet vnic_type: direct - vtc_flavor: m1.large + vtc_flavor: yardstick-flavor runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml index 107c28d1d..6f99ea6f2 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml @@ -19,7 +19,7 @@ scenarios: vlan_net_2_name: apexlake_outbound_network vlan_subnet_2_name: apexlake_outbound_subnet vnic_type: direct - vtc_flavor: m1.large + vtc_flavor: yardstick-flavor num_of_neighbours: 2 amount_of_ram: 1G number_of_cores: 2 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml index f64968cb1..6c7f96799 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml @@ -26,7 +26,7 @@ scenarios: context: name: yardstick-TC010 image: yardstick-image - flavor: m1.small + flavor: yardstick-flavor user: ubuntu servers: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml index a86943a51..ba246ff11 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml @@ -27,7 +27,7 @@ scenarios: context: name: demo image: yardstick-image - flavor: m1.small + flavor: yardstick-flavor user: ubuntu servers: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml index 7e5756001..cbdaf3970 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml @@ -15,7 +15,7 @@ scenarios: vlan_net_2_name: apexlake_outbound_network vlan_subnet_2_name: apexlake_outbound_subnet vnic_type: direct - vtc_flavor: m1.large + vtc_flavor: yardstick-flavor runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml index 769d75618..17249785a 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml @@ -15,7 +15,7 @@ scenarios: vlan_net_2_name: apexlake_outbound_network vlan_subnet_2_name: apexlake_outbound_subnet vnic_type: direct - vtc_flavor: m1.large + vtc_flavor: yardstick-flavor num_of_neighbours: 2 amount_of_ram: 1G number_of_cores: 2 diff --git a/tests/unit/test_ssh.py b/tests/unit/test_ssh.py index 88638a0a8..8b828ed7c 100644 --- a/tests/unit/test_ssh.py +++ b/tests/unit/test_ssh.py @@ -314,7 +314,7 @@ class SSHRunTestCase(unittest.TestCase): self.test_client._put_file_shell("localfile", "remotefile", 0o42) self.test_client.run.assert_called_once_with( - 'cat > "remotefile"&& chmod -- 042 "remotefile"', + 'cat > remotefile && chmod -- 042 remotefile', stdin=mock_open.return_value.__enter__.return_value) @mock.patch("yardstick.ssh.os.stat") |