Skip to content

Commit e6394e9

Browse files
committed
fixup legacy pytest tests
1 parent d300814 commit e6394e9

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

roles/activemq/molecule/default/tests/test_activemq.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ def get_ansible_vars(host):
1212
"""Define get_ansible_vars"""
1313
java_role = "file=../java/vars/main.yml name=java_role"
1414
activemq_role = "file=../../vars/main.yml name=activemq_role"
15-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
16-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
15+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
16+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
1717
group_vars = "file=../../../../group_vars/all.yml name=group_vars"
1818
secrets_vars = "file=../../../../vars/secrets.yml name=secrets_vars"
1919
ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]

roles/java/molecule/default/tests/test_java.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
def get_ansible_vars(host):
99
"""Define get_ansible_vars"""
1010
java_role = "file=../../vars/main.yml name=java_role"
11-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
12-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
11+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
12+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
1313
group_vars = "file=../../../../group_vars/all.yml name=group_vars"
1414
ansible_vars = host.ansible(
1515
"include_vars",

roles/nginx/molecule/default/tests/test_nginx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
@pytest.fixture(scope="module")
1111
def get_ansible_vars(host):
1212
"""Define get_ansible_vars"""
13-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
14-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
13+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
14+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
1515
nginx_vars = "file=../../vars/main.yml name=nginx_vars"
1616
distribution_name = host.ansible("setup")["ansible_facts"]["ansible_distribution"]
1717
distribution_version = host.ansible("setup")["ansible_facts"]["ansible_distribution_version"]

roles/repository/molecule/default/tests/test_repository.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def get_ansible_vars(host):
1717
repository_role = "file=../../vars/main.yml name=repository_role"
1818
tomcat_role = "file=../tomcat/vars/main.yml name=tomcat_role"
1919
java_role = "file=../java/vars/main.yml name=java_role"
20-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
21-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
20+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
21+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
2222
group_vars = "file=../../../../group_vars/all.yml name=group_vars"
2323
ansible_vars = host.ansible("include_vars", group_vars)["ansible_facts"]["group_vars"]
2424
ansible_vars.update(host.ansible("include_vars", common_defaults)["ansible_facts"]["common_defaults"])

roles/search/molecule/default/tests/test_search.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
def get_ansible_vars(host):
1313
"""Define get_ansible_vars"""
1414
java_role = "file=../java/vars/main.yml name=java_role"
15-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
16-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
17-
common_hosts = "file=../../../common/defaults/main.yml name=common_hosts"
15+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
16+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
17+
common_hosts = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_hosts"
1818
search_services = "file=../../vars/main.yml name=search_services"
1919
ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
2020
ansible_vars.update(host.ansible("include_vars", java_role)["ansible_facts"]["java_role"])

roles/sfs/molecule/default/tests/test_sfs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
def get_ansible_vars(host):
1212
"""Define get_ansible_vars"""
1313
java_role = "file=../roles/java/vars/main.yml name=java_role"
14-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
15-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
16-
common_hosts = "file=../../../common/vars/hosts.yml name=common_hosts"
14+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
15+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
16+
common_hosts = "file=../../../../collections/alfresco/platform/roles/common/vars/hosts.yml name=common_hosts"
1717
ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
1818
ansible_vars.update(host.ansible("include_vars", common_vars)["ansible_facts"]["common_vars"])
1919
ansible_vars.update(host.ansible("include_vars", common_hosts)["ansible_facts"]["common_hosts"])

roles/sync/molecule/default/tests/test_sync.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
def get_ansible_vars(host):
1212
"""Define get_ansible_vars"""
1313
java_role = "file=../java/vars/main.yml name=java_role"
14-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
15-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
14+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
15+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
1616
common_hosts = "file=../../../../group_vars/all.yml name=common_hosts"
1717
syncservices = "file=../../vars/main.yml name=syncservices"
1818
ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]

roles/tomcat/molecule/default/tests/test_tomcat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ def get_ansible_vars(host):
88
"""Define get_ansible_vars"""
99
java_role = "file=../java/vars/main.yml name=java_role"
1010
tomcat_role = "file=../../vars/main.yml name=tomcat_role"
11-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
12-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
11+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
12+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
1313
group_vars = "file=../../../../group_vars/all.yml name=group_vars"
1414
ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
1515
ansible_vars.update(host.ansible("include_vars", tomcat_role)["ansible_facts"]["tomcat_role"])

roles/transformers/molecule/default/tests/test_transform.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
def get_ansible_vars(host):
1212
"""Define get_ansible_vars"""
1313
java_role = "file=../java/vars/main.yml name=java_role"
14-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
15-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
16-
common_hosts = "file=../../../common/vars/hosts.yml name=common_hosts"
14+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
15+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
16+
common_hosts = "file=../../../../collections/alfresco/platform/roles/common/vars/hosts.yml name=common_hosts"
1717
transform_services = "file=../../vars/main.yml name=transform_services"
1818
ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
1919
ansible_vars.update(host.ansible("include_vars", java_role)["ansible_facts"]["java_role"])

roles/trouter/molecule/default/tests/test_trouter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
def get_ansible_vars(host):
1212
"""Define get_ansible_vars"""
1313
java_role = "file=../roles/java/vars/main.yml name=java_role"
14-
common_vars = "file=../../../common/vars/main.yml name=common_vars"
15-
common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
16-
common_hosts = "file=../../../common/vars/hosts.yml name=common_hosts"
14+
common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
15+
common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
16+
common_hosts = "file=../../../../collections/alfresco/platform/roles/common/vars/hosts.yml name=common_hosts"
1717
ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
1818
ansible_vars.update(host.ansible("include_vars", common_vars)["ansible_facts"]["common_vars"])
1919
ansible_vars.update(host.ansible("include_vars", common_hosts)["ansible_facts"]["common_hosts"])

0 commit comments

Comments
 (0)