autonomic-cooperative/molecule-hetznercloud
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6 from pycontribs/fix-ci

Browse Source 
Fix CI
This commit is contained in:
decentral1se 2019-11-16 08:29:02 +07:00 committed by GitHub
commit b265c962e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
molecule_hetznercloud/test/unit/driver/test_hetznercloud.py
View File

@ -22,7 +22,7 @@ import os
import pytest import pytest
from molecule import config from molecule import config
from molecule.driver import hetznercloud from molecule_hetznercloud import hetznercloud
@pytest.fixture @pytest.fixture
@ -96,7 +96,7 @@ def test_hetznercloud_default_ssh_connection_options_property(hetznercloud_insta
def test_hetznercloud_login_options(hetznercloud_instance, mocker): def test_hetznercloud_login_options(hetznercloud_instance, mocker):
target = "molecule.driver.hetznercloud.HetznerCloud._get_instance_config" target = "molecule_hetznercloud.hetznercloud.HetznerCloud._get_instance_config"
get_instance_config_patch = mocker.patch(target) get_instance_config_patch = mocker.patch(target)
get_instance_config_patch.return_value = { get_instance_config_patch.return_value = {
@ -119,7 +119,7 @@ def test_hetznercloud_login_options(hetznercloud_instance, mocker):
def test_hetznercloud_ansible_connection_opts(hetznercloud_instance, mocker): def test_hetznercloud_ansible_connection_opts(hetznercloud_instance, mocker):
target = "molecule.driver.hetznercloud.HetznerCloud._get_instance_config" target = "molecule_hetznercloud.hetznercloud.HetznerCloud._get_instance_config"
get_instance_config_patch = mocker.patch(target) get_instance_config_patch = mocker.patch(target)
get_instance_config_patch.return_value = { get_instance_config_patch.return_value = {

2
molecule_hetznercloud/test/unit/model/v2/test_platforms_section.py
View File

@ -66,6 +66,7 @@ def _model_platforms_hetznercloud_errors_section_data():
} }
@pytest.mark.skip(reason="https://github.com/ansible/molecule/issues/2442")
@pytest.mark.parametrize( @pytest.mark.parametrize(
"_config", ["_model_platforms_hetznercloud_errors_section_data"], indirect=True "_config", ["_model_platforms_hetznercloud_errors_section_data"], indirect=True
) )
@ -91,6 +92,7 @@ def test_platforms_hetznercloud_has_errors(_config):
assert expected_config == schema_v2.validate(_config) assert expected_config == schema_v2.validate(_config)
@pytest.mark.skip(reason="https://github.com/ansible/molecule/issues/2442")
@pytest.mark.parametrize( @pytest.mark.parametrize(
"_config", ["_model_platform_hetznercloud_section_data"], indirect=True "_config", ["_model_platform_hetznercloud_section_data"], indirect=True
) )

5
pytest.ini
View File

@ -3,3 +3,8 @@ addopts = -v -rxXs --doctest-modules --durations 10 --cov=molecule_hetznercloud
doctest_optionflags = ALLOW_UNICODE ELLIPSIS doctest_optionflags = ALLOW_UNICODE ELLIPSIS
junit_suite_name = molecule_test_suite junit_suite_name = molecule_test_suite
norecursedirs = dist doc build .tox .eggs norecursedirs = dist doc build .tox .eggs
filterwarnings =
# remove once https://github.com/cookiecutter/cookiecutter/pull/1127 is released
ignore::DeprecationWarning:cookiecutter
# remove once https://github.com/pytest-dev/pytest-cov/issues/327 is released
ignore::pytest.PytestWarning:pytest_cov

2
setup.cfg
View File

@ -64,7 +64,7 @@ setup_requires =
setuptools_scm >= 1.15.0 setuptools_scm >= 1.15.0
setuptools_scm_git_archive >= 1.0 setuptools_scm_git_archive >= 1.0
install_requires = install_requires =
molecule >= 3.0a3 molecule >= 3.0a3, <= 3.0
pyyaml >= 5.1, < 6 pyyaml >= 5.1, < 6
backports.shutil_which ; python_version<"3.3" backports.shutil_which ; python_version<"3.3"

2
tox.ini
View File

@ -13,7 +13,7 @@ passenv = *
setenv = setenv =
ANSIBLE_CALLABLE_WHITELIST={env:ANSIBLE_CALLABLE_WHITELIST:timer,profile_roles} ANSIBLE_CALLABLE_WHITELIST={env:ANSIBLE_CALLABLE_WHITELIST:timer,profile_roles}
PYTHONDONTWRITEBYTECODE=1 PYTHONDONTWRITEBYTECODE=1
PYTEST_ADDOPTS=molecule_hetznercloud/test/unit/ --cov={toxinidir}/molecule/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto} PYTEST_ADDOPTS=molecule_hetznercloud/test/unit/ --cov={toxinidir}/molecule_hetznercloud/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto}
deps = deps =
ansible28: ansible>=2.8,<2.9 ansible28: ansible>=2.8,<2.9
extras = extras =