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

Jump to bottom

Remove test dependency on external galaxy role #2813

Merged
merged 1 commit into from
Sep 1, 2020
Merged

Remove test dependency on external galaxy role #2813

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 10 additions & 11 deletions molecule/test/functional/test_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
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
6 changes: 2 additions & 4 deletions molecule/test/scenarios/dependency/molecule/ansible-galaxy/requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
[]
6 changes: 2 additions & 4 deletions molecule/test/scenarios/dependency/molecule/shell/requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
[]