Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history 
for more information, see https://pre-commit.ci
  • Loading branch information
@pre-commit-ci
pre-commit-ci[bot] committed Nov 22, 2021
1 parent 0a75f17 commit d0d87b1
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 94 deletions.
18 changes: 9 additions & 9 deletions ...le_digitalocean/test/scenarios/driver/digitalocean/molecule/default/tests/test_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
import testinfra.utils.ansible_runner

testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
os.environ['MOLECULE_INVENTORY_FILE']
).get_hosts('all')
os.environ["MOLECULE_INVENTORY_FILE"]
).get_hosts("all")


def test_hostname(host):
assert 'instance' == host.check_output('hostname -s')
assert "instance" == host.check_output("hostname -s")


def test_etc_molecule_directory(host):
f = host.file('/etc/molecule')
f = host.file("/etc/molecule")

assert f.is_directory
assert f.user == 'root'
assert f.group == 'root'
assert f.user == "root"
assert f.group == "root"
assert f.mode == 0o755


def test_etc_molecule_ansible_hostname_file(host):
f = host.file('/etc/molecule/instance')
f = host.file("/etc/molecule/instance")

assert f.is_file
assert f.user == 'root'
assert f.group == 'root'
assert f.user == "root"
assert f.group == "root"
assert f.mode == 0o644
18 changes: 9 additions & 9 deletions ...digitalocean/test/scenarios/driver/digitalocean/molecule/multi-node/tests/test_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
import testinfra.utils.ansible_runner

testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
os.environ['MOLECULE_INVENTORY_FILE']
).get_hosts('all')
os.environ["MOLECULE_INVENTORY_FILE"]
).get_hosts("all")


def test_hostname(host):
assert re.search(r'instance-[12].*', host.check_output('hostname -s'))
assert re.search(r"instance-[12].*", host.check_output("hostname -s"))


def test_etc_molecule_directory(host):
f = host.file('/etc/molecule')
f = host.file("/etc/molecule")

assert f.is_directory
assert f.user == 'root'
assert f.group == 'root'
assert f.user == "root"
assert f.group == "root"
assert f.mode == 0o755


def test_etc_molecule_ansible_hostname_file(host):
filename = '/etc/molecule/{}'.format(host.check_output('hostname -s'))
filename = "/etc/molecule/{}".format(host.check_output("hostname -s"))
f = host.file(filename)

assert f.is_file
assert f.user == 'root'
assert f.group == 'root'
assert f.user == "root"
assert f.group == "root"
assert f.mode == 0o644
152 changes: 76 additions & 76 deletions molecule_digitalocean/test/unit/driver/test_digitalocean.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,30 @@ def test_config_private_member(_instance):

def test_testinfra_options_property(_instance):
assert {
'connection': 'ansible',
'ansible-inventory': _instance._config.provisioner.inventory_file,
"connection": "ansible",
"ansible-inventory": _instance._config.provisioner.inventory_file,
} == _instance.testinfra_options


def test_name_property(_instance):
assert 'digitalocean' == _instance.name
assert "digitalocean" == _instance.name


def test_options_property(_instance):
expected_options = {'managed': True}
expected_options = {"managed": True}

assert expected_options == _instance.options


def test_login_cmd_template_property(_instance):
expected_ssh_command = (
'ssh {address} '
'-l {user} -p {port} -i {identity_file} '
'-o UserKnownHostsFile=/dev/null '
'-o ControlMaster=auto '
'-o ControlPersist=60s '
'-o IdentitiesOnly=yes '
'-o StrictHostKeyChecking=no'
"ssh {address} "
"-l {user} -p {port} -i {identity_file} "
"-o UserKnownHostsFile=/dev/null "
"-o ControlMaster=auto "
"-o ControlPersist=60s "
"-o IdentitiesOnly=yes "
"-o StrictHostKeyChecking=no"
)

assert expected_ssh_command == _instance.login_cmd_template
Expand All @@ -69,7 +69,7 @@ def test_login_cmd_template_property(_instance):
def test_safe_files_property(_instance):
expected_safe_files = [
os.path.join(
_instance._config.scenario.ephemeral_directory, 'instance_config.yml'
_instance._config.scenario.ephemeral_directory, "instance_config.yml"
)
]

Expand All @@ -79,7 +79,7 @@ def test_safe_files_property(_instance):
def test_default_safe_files_property(_instance):
expected_default_safe_files = [
os.path.join(
_instance._config.scenario.ephemeral_directory, 'instance_config.yml'
_instance._config.scenario.ephemeral_directory, "instance_config.yml"
)
]

Expand All @@ -96,92 +96,92 @@ def test_managed_property(_instance):

def test_default_ssh_connection_options_property(_instance):
expected_ssh_defaults = [
'-o UserKnownHostsFile=/dev/null',
'-o ControlMaster=auto',
'-o ControlPersist=60s',
'-o IdentitiesOnly=yes',
'-o StrictHostKeyChecking=no',
"-o UserKnownHostsFile=/dev/null",
"-o ControlMaster=auto",
"-o ControlPersist=60s",
"-o IdentitiesOnly=yes",
"-o StrictHostKeyChecking=no",
]

assert expected_ssh_defaults == _instance.default_ssh_connection_options


def test_login_options(mocker, _instance):
m = mocker.patch('molecule.driver.digitalocean.DigitalOcean._get_instance_config')
m = mocker.patch("molecule.driver.digitalocean.DigitalOcean._get_instance_config")
m.return_value = {
'instance': 'foo',
'address': '172.16.0.2',
'user': 'cloud-user',
'port': 22,
'identity_file': '/foo/bar',
"instance": "foo",
"address": "172.16.0.2",
"user": "cloud-user",
"port": 22,
"identity_file": "/foo/bar",
}

expected_login_data = {
'instance': 'foo',
'address': '172.16.0.2',
'user': 'cloud-user',
'port': 22,
'identity_file': '/foo/bar',
"instance": "foo",
"address": "172.16.0.2",
"user": "cloud-user",
"port": 22,
"identity_file": "/foo/bar",
}
assert expected_login_data == _instance.login_options('foo')
assert expected_login_data == _instance.login_options("foo")


def test_ansible_connection_options(mocker, _instance):
m = mocker.patch('molecule.driver.digitalocean.DigitalOcean._get_instance_config')
m = mocker.patch("molecule.driver.digitalocean.DigitalOcean._get_instance_config")
m.return_value = {
'instance': 'foo',
'address': '172.16.0.2',
'user': 'cloud-user',
'port': 22,
'identity_file': '/foo/bar',
"instance": "foo",
"address": "172.16.0.2",
"user": "cloud-user",
"port": 22,
"identity_file": "/foo/bar",
}

expected_cnx_data = {
'ansible_host': '172.16.0.2',
'ansible_port': 22,
'ansible_user': 'cloud-user',
'ansible_private_key_file': '/foo/bar',
'connection': 'ssh',
'ansible_ssh_common_args': (
'-o UserKnownHostsFile=/dev/null '
'-o ControlMaster=auto '
'-o ControlPersist=60s '
'-o IdentitiesOnly=yes '
'-o StrictHostKeyChecking=no'
"ansible_host": "172.16.0.2",
"ansible_port": 22,
"ansible_user": "cloud-user",
"ansible_private_key_file": "/foo/bar",
"connection": "ssh",
"ansible_ssh_common_args": (
"-o UserKnownHostsFile=/dev/null "
"-o ControlMaster=auto "
"-o ControlPersist=60s "
"-o IdentitiesOnly=yes "
"-o StrictHostKeyChecking=no"
),
}
assert expected_cnx_data == _instance.ansible_connection_options('foo')
assert expected_cnx_data == _instance.ansible_connection_options("foo")


def test_ansible_connection_options_handles_missing_instance_config(mocker, _instance):
m = mocker.patch('molecule.util.safe_load_file')
m = mocker.patch("molecule.util.safe_load_file")
m.side_effect = IOError

assert {} == _instance.ansible_connection_options('foo')
assert {} == _instance.ansible_connection_options("foo")


def test_ansible_connection_options_handles_missing_results_key(mocker, _instance):
m = mocker.patch('molecule.util.safe_load_file')
m = mocker.patch("molecule.util.safe_load_file")
m.side_effect = StopIteration

assert {} == _instance.ansible_connection_options('foo')
assert {} == _instance.ansible_connection_options("foo")


def test_instance_config_property(_instance):
expected_config_file = os.path.join(
_instance._config.scenario.ephemeral_directory, 'instance_config.yml'
_instance._config.scenario.ephemeral_directory, "instance_config.yml"
)

assert expected_config_file == _instance.instance_config


def test_ssh_connection_options_property(_instance):
expected_ssh_options = [
'-o UserKnownHostsFile=/dev/null',
'-o ControlMaster=auto',
'-o ControlPersist=60s',
'-o IdentitiesOnly=yes',
'-o StrictHostKeyChecking=no',
"-o UserKnownHostsFile=/dev/null",
"-o ControlMaster=auto",
"-o ControlPersist=60s",
"-o IdentitiesOnly=yes",
"-o StrictHostKeyChecking=no",
]

assert expected_ssh_options == _instance.ssh_connection_options
Expand All @@ -192,32 +192,32 @@ def test_status(mocker, _instance):

assert 2 == len(result)

assert result[0].instance_name == 'instance-1'
assert result[0].driver_name == 'digitalocean'
assert result[0].provisioner_name == 'ansible'
assert result[0].scenario_name == 'default'
assert result[0].created == 'false'
assert result[0].converged == 'false'
assert result[0].instance_name == "instance-1"
assert result[0].driver_name == "digitalocean"
assert result[0].provisioner_name == "ansible"
assert result[0].scenario_name == "default"
assert result[0].created == "false"
assert result[0].converged == "false"

assert result[1].instance_name == 'instance-2'
assert result[1].driver_name == 'digitalocean'
assert result[1].provisioner_name == 'ansible'
assert result[1].scenario_name == 'default'
assert result[1].created == 'false'
assert result[1].converged == 'false'
assert result[1].instance_name == "instance-2"
assert result[1].driver_name == "digitalocean"
assert result[1].provisioner_name == "ansible"
assert result[1].scenario_name == "default"
assert result[1].created == "false"
assert result[1].converged == "false"


def test_get_instance_config(mocker, _instance):
m = mocker.patch('molecule.util.safe_load_file')
m.return_value = [{'instance': 'foo'}, {'instance': 'bar'}]
m = mocker.patch("molecule.util.safe_load_file")
m.return_value = [{"instance": "foo"}, {"instance": "bar"}]

expected_instance = {'instance': 'foo'}
assert expected_instance == _instance._get_instance_config('foo')
expected_instance = {"instance": "foo"}
assert expected_instance == _instance._get_instance_config("foo")


def test_created(_instance):
assert 'false' == _instance._created()
assert "false" == _instance._created()


def test_converged(_instance):
assert 'false' == _instance._converged()
assert "false" == _instance._converged()

0 comments on commit d0d87b1

Please sign in to comment.