Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only test default driver with delegated #2146

Merged
merged 1 commit into from
Jul 5, 2019
Merged

Only test default driver with delegated #2146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 13 additions & 114 deletions test/functional/test_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ def driver_name(request):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -55,12 +54,7 @@ def driver_name(request):
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand All @@ -75,8 +69,7 @@ def test_command_check(scenario_to_test, with_scenario, scenario_name):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -86,12 +79,7 @@ def test_command_check(scenario_to_test, with_scenario, scenario_name):
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand All @@ -106,21 +94,15 @@ def test_command_cleanup(scenario_to_test, with_scenario, scenario_name):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/docker', 'docker', 'default'),
('driver/ec2', 'ec2', 'default'),
('driver/gce', 'gce', 'default'),
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand All @@ -135,8 +117,7 @@ def test_command_converge(scenario_to_test, with_scenario, scenario_name):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -146,12 +127,7 @@ def test_command_converge(scenario_to_test, with_scenario, scenario_name):
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand Down Expand Up @@ -268,8 +244,7 @@ def test_command_dependency_shell(request, scenario_to_test, with_scenario,


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -279,12 +254,7 @@ def test_command_dependency_shell(request, scenario_to_test, with_scenario,
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand All @@ -299,8 +269,7 @@ def test_command_destroy(scenario_to_test, with_scenario, scenario_name):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -310,12 +279,7 @@ def test_command_destroy(scenario_to_test, with_scenario, scenario_name):
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand Down Expand Up @@ -368,8 +332,7 @@ def test_command_init_scenario(temp_dir, driver_name, skip_test):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -379,12 +342,7 @@ def test_command_init_scenario(temp_dir, driver_name, skip_test):
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand Down Expand Up @@ -470,10 +428,6 @@ def test_command_lint(scenario_to_test, with_scenario, scenario_name):
Instance Name Driver Name Provisioner Name Scenario Name Created Converged
---------------------------- ------------- ------------------ --------------- --------- -----------
delegated-instance-docker delegated ansible docker unknown true
delegated-instance-ec2 delegated ansible ec2 unknown true
delegated-instance-gce delegated ansible gce unknown true
delegated-instance-openstack delegated ansible openstack unknown true
delegated-instance-vagrant delegated ansible vagrant unknown false
""".strip()), # noqa
('driver/vagrant', 'vagrant', """
Instance Name Driver Name Provisioner Name Scenario Name Created Converged
Expand Down Expand Up @@ -541,10 +495,6 @@ def test_command_list(scenario_to_test, with_scenario, expected):
""".strip()),
('driver/delegated', 'delegated', """
delegated-instance-docker delegated ansible docker unknown true
delegated-instance-ec2 delegated ansible ec2 unknown true
delegated-instance-gce delegated ansible gce unknown true
delegated-instance-openstack delegated ansible openstack unknown true
delegated-instance-vagrant delegated ansible vagrant unknown false
""".strip()),
('driver/vagrant', 'vagrant', """
instance vagrant ansible default false false
Expand All @@ -562,8 +512,7 @@ def test_command_list_with_format_plain(scenario_to_test, with_scenario,


@pytest.mark.parametrize(
'scenario_to_test, driver_name, login_args, scenario_name',
[
'scenario_to_test, driver_name, login_args, scenario_name', [
('driver/azure', 'azure', [[
'instance',
'.*instance.*',
Expand Down Expand Up @@ -643,30 +592,10 @@ def test_command_list_with_format_plain(scenario_to_test, with_scenario,
'instance-2',
'.*instance-2.*',
]], 'multi-node'),
('driver/delegated', 'delegated', [[
'delegated-instance-azure',
'.*delegated-instance-azure.*',
]], 'azure'),
('driver/delegated', 'delegated', [[
'delegated-instance-docker',
'.*delegated-instance-docker.*',
]], 'docker'),
('driver/delegated', 'delegated', [[
'delegated-instance-ec2',
'.*ip-.*',
]], 'ec2'),
('driver/delegated', 'delegated', [[
'delegated-instance-gce',
'.*delegated-instance-gce.*',
]], 'gce'),
('driver/delegated', 'delegated', [[
'delegated-instance-openstack',
'.*delegated-instance-openstack.*',
]], 'openstack'),
# ('driver/delegated', 'delegated', [[
# 'delegated-instance-vagrant',
# '.*delegated-instance-vagrant.*',
# ]], 'vagrant'),
('driver/vagrant', 'vagrant', [[
'instance-1',
'.*instance-1.*',
Expand All @@ -686,8 +615,7 @@ def test_command_login(scenario_to_test, with_scenario, login_args,


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -697,12 +625,7 @@ def test_command_login(scenario_to_test, with_scenario, login_args,
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand All @@ -721,8 +644,7 @@ def test_command_prepare(scenario_to_test, with_scenario, scenario_name):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -732,12 +654,7 @@ def test_command_prepare(scenario_to_test, with_scenario, scenario_name):
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand All @@ -752,8 +669,7 @@ def test_command_side_effect(scenario_to_test, with_scenario, scenario_name):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -763,12 +679,7 @@ def test_command_side_effect(scenario_to_test, with_scenario, scenario_name):
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand All @@ -783,8 +694,7 @@ def test_command_syntax(scenario_to_test, with_scenario, scenario_name):


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', None),
('driver/digitalocean', 'digitalocean', None),
('driver/docker', 'docker', 'default'),
Expand All @@ -796,12 +706,7 @@ def test_command_syntax(scenario_to_test, with_scenario, scenario_name):
('driver/lxc', 'lxc', None),
('driver/lxd', 'lxd', None),
('driver/openstack', 'openstack', None),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', None),
],
indirect=[
Expand All @@ -815,8 +720,7 @@ def test_command_test(scenario_to_test, with_scenario, scenario_name,


@pytest.mark.parametrize(
'scenario_to_test, driver_name, scenario_name',
[
'scenario_to_test, driver_name, scenario_name', [
('driver/azure', 'azure', 'default'),
('driver/digitalocean', 'digitalocean', 'default'),
('driver/docker', 'docker', 'default'),
Expand All @@ -825,12 +729,7 @@ def test_command_test(scenario_to_test, with_scenario, scenario_name,
('driver/lxc', 'lxc', 'default'),
('driver/lxd', 'lxd', 'default'),
('driver/openstack', 'openstack', 'default'),
# ('driver/delegated', 'delegated', 'azure'),
('driver/delegated', 'delegated', 'docker'),
('driver/delegated', 'delegated', 'ec2'),
('driver/delegated', 'delegated', 'gce'),
('driver/delegated', 'delegated', 'openstack'),
# ('driver/delegated', 'delegated', 'vagrant'),
('driver/vagrant', 'vagrant', 'default'),
],
indirect=[
Expand Down