Fix unit test relative imports, and permissions for included collection requirements (#29)

* Fix Hetzner firewall unit test imports.

* Make sure tests can actually access collections.

* Fix more relative imports.

* Fix more relative imports.

* Fix more includes.

* Fix more tests.

* One more.

* Fix syntax error in sanity import tests (invalid escape sequence "\$" caused by non-raw docs block)

* Fix permissions of ansible-test parts for sanity tests.

* Revert "Fix permissions of ansible-test parts for sanity tests."

This reverts commit c2713f0a12.
This commit is contained in:
Felix Fontein
2020-03-24 09:27:28 +01:00
committed by GitHub
parent 676bec5484
commit c012d0fba7
202 changed files with 239 additions and 233 deletions

View File

@@ -28,10 +28,10 @@ try:
from test.unit.modules.utils import set_module_args
except ImportError:
try:
from ansible.modules.network.f5.bigip_security_address_list import ApiParameters
from ansible.modules.network.f5.bigip_security_address_list import ModuleParameters
from ansible.modules.network.f5.bigip_security_address_list import ModuleManager
from ansible.modules.network.f5.bigip_security_address_list import ArgumentSpec
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_address_list import ApiParameters
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_address_list import ModuleParameters
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_address_list import ModuleManager
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_address_list import ArgumentSpec
from ansible_collections.community.general.tests.unit.modules.utils import set_module_args
except ImportError:
pytestmark.append(pytest.mark.skip("F5 Ansible modules require the f5-sdk Python library"))

View File

@@ -28,10 +28,10 @@ try:
from test.unit.modules.utils import set_module_args
except ImportError:
try:
from ansible.modules.network.f5.bigip_security_port_list import ApiParameters
from ansible.modules.network.f5.bigip_security_port_list import ModuleParameters
from ansible.modules.network.f5.bigip_security_port_list import ModuleManager
from ansible.modules.network.f5.bigip_security_port_list import ArgumentSpec
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_port_list import ApiParameters
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_port_list import ModuleParameters
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_port_list import ModuleManager
from ansible_collections.community.general.plugins.modules.network.f5.bigip_security_port_list import ArgumentSpec
from ansible_collections.community.general.tests.unit.modules.utils import set_module_args
except ImportError:
pytestmark.append(pytest.mark.skip("F5 Ansible modules require the f5-sdk Python library"))