Skip to content

Commit

Permalink
Remove test dependency on external galaxy role (#2813)
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea committed Sep 1, 2020
1 parent fcdcfdc commit 3a3cf05
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 19 deletions.
21 changes: 10 additions & 11 deletions molecule/test/functional/test_command.py
Expand Up @@ -100,9 +100,6 @@ def test_command_create(scenario_to_test, with_scenario, scenario_name):
pytest.helpers.run_command(cmd)


@pytest.mark.skip(
reason="Disabled due to https://github.com/ansible/galaxy/issues/2030"
)
@pytest.mark.parametrize(
"scenario_to_test, driver_name, scenario_name",
[
Expand All @@ -117,14 +114,16 @@ def test_command_dependency_ansible_galaxy(
cmd = sh.molecule.bake("dependency", **options)
pytest.helpers.run_command(cmd)

dependency_role = os.path.join(
ephemeral_directory("molecule"),
"dependency",
"ansible-galaxy",
"roles",
"timezone",
)
assert os.path.isdir(dependency_role)
# Not testing the outcome because we dot effectively install any role,
# currently we cannot do this in offline mode.
# dependency_role = os.path.join(
# ephemeral_directory("molecule"),
# "dependency",
# "ansible-galaxy",
# "roles",
# "timezone",
# )
# assert os.path.isdir(dependency_role)


@pytest.mark.parametrize(
Expand Down
@@ -1,4 +1,2 @@
---
- name: timezone
src: yatesr.timezone
version: 1.1.0
# See https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#installing-roles-and-collections-from-the-same-requirements-yml-file
[]
@@ -1,4 +1,2 @@
---
- name: timezone
src: yatesr.timezone
version: 1.1.0
# See https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#installing-roles-and-collections-from-the-same-requirements-yml-file
[]

0 comments on commit 3a3cf05

Please sign in to comment.