From 88eaf1154ae768384b88ec8b77c15826c4be3c10 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 25 Jan 2019 11:11:12 -0500 Subject: [PATCH] move awx.main.utils.ansible tests data into the correct location --- .../ansible_utils}/inventories/invalid/bad | 0 .../inventories/invalid/bad_encoding | 0 .../inventories/invalid/empty.txt | 0 .../inventories/valid/executable | 0 .../ansible_utils}/inventories/valid/hosts | 0 .../inventories/valid/inventory | 0 .../ansible_utils}/playbooks/invalid/bad | 0 .../playbooks/invalid/bad_encoding | 0 .../ansible_utils}/playbooks/invalid/empty | 0 .../playbooks/invalid/wrong_file_extension | 0 .../playbooks/valid/hello_world.yaml | 0 .../playbooks/valid/hello_world.yml | 0 .../ansible_utils}/playbooks/valid/hosts.yml | 0 .../ansible_utils}/playbooks/valid/import.yml | 0 .../playbooks/valid/include.yml | 0 .../ansible_utils}/playbooks/valid/vault.yml | 0 awx/main/tests/unit/utils/ansible/__init__.py | 0 .../tests/unit/utils/ansible/test_ansible.py | 32 ------------------ awx/main/tests/unit/utils/test_ansible.py | 33 +++++++++++++++++++ 19 files changed, 33 insertions(+), 32 deletions(-) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/inventories/invalid/bad (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/inventories/invalid/bad_encoding (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/inventories/invalid/empty.txt (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/inventories/valid/executable (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/inventories/valid/hosts (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/inventories/valid/inventory (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/invalid/bad (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/invalid/bad_encoding (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/invalid/empty (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/invalid/wrong_file_extension (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/valid/hello_world.yaml (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/valid/hello_world.yml (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/valid/hosts.yml (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/valid/import.yml (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/valid/include.yml (100%) rename awx/main/tests/{unit/utils/ansible => data/ansible_utils}/playbooks/valid/vault.yml (100%) delete mode 100644 awx/main/tests/unit/utils/ansible/__init__.py delete mode 100644 awx/main/tests/unit/utils/ansible/test_ansible.py create mode 100644 awx/main/tests/unit/utils/test_ansible.py diff --git a/awx/main/tests/unit/utils/ansible/inventories/invalid/bad b/awx/main/tests/data/ansible_utils/inventories/invalid/bad similarity index 100% rename from awx/main/tests/unit/utils/ansible/inventories/invalid/bad rename to awx/main/tests/data/ansible_utils/inventories/invalid/bad diff --git a/awx/main/tests/unit/utils/ansible/inventories/invalid/bad_encoding b/awx/main/tests/data/ansible_utils/inventories/invalid/bad_encoding similarity index 100% rename from awx/main/tests/unit/utils/ansible/inventories/invalid/bad_encoding rename to awx/main/tests/data/ansible_utils/inventories/invalid/bad_encoding diff --git a/awx/main/tests/unit/utils/ansible/inventories/invalid/empty.txt b/awx/main/tests/data/ansible_utils/inventories/invalid/empty.txt similarity index 100% rename from awx/main/tests/unit/utils/ansible/inventories/invalid/empty.txt rename to awx/main/tests/data/ansible_utils/inventories/invalid/empty.txt diff --git a/awx/main/tests/unit/utils/ansible/inventories/valid/executable b/awx/main/tests/data/ansible_utils/inventories/valid/executable similarity index 100% rename from awx/main/tests/unit/utils/ansible/inventories/valid/executable rename to awx/main/tests/data/ansible_utils/inventories/valid/executable diff --git a/awx/main/tests/unit/utils/ansible/inventories/valid/hosts b/awx/main/tests/data/ansible_utils/inventories/valid/hosts similarity index 100% rename from awx/main/tests/unit/utils/ansible/inventories/valid/hosts rename to awx/main/tests/data/ansible_utils/inventories/valid/hosts diff --git a/awx/main/tests/unit/utils/ansible/inventories/valid/inventory b/awx/main/tests/data/ansible_utils/inventories/valid/inventory similarity index 100% rename from awx/main/tests/unit/utils/ansible/inventories/valid/inventory rename to awx/main/tests/data/ansible_utils/inventories/valid/inventory diff --git a/awx/main/tests/unit/utils/ansible/playbooks/invalid/bad b/awx/main/tests/data/ansible_utils/playbooks/invalid/bad similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/invalid/bad rename to awx/main/tests/data/ansible_utils/playbooks/invalid/bad diff --git a/awx/main/tests/unit/utils/ansible/playbooks/invalid/bad_encoding b/awx/main/tests/data/ansible_utils/playbooks/invalid/bad_encoding similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/invalid/bad_encoding rename to awx/main/tests/data/ansible_utils/playbooks/invalid/bad_encoding diff --git a/awx/main/tests/unit/utils/ansible/playbooks/invalid/empty b/awx/main/tests/data/ansible_utils/playbooks/invalid/empty similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/invalid/empty rename to awx/main/tests/data/ansible_utils/playbooks/invalid/empty diff --git a/awx/main/tests/unit/utils/ansible/playbooks/invalid/wrong_file_extension b/awx/main/tests/data/ansible_utils/playbooks/invalid/wrong_file_extension similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/invalid/wrong_file_extension rename to awx/main/tests/data/ansible_utils/playbooks/invalid/wrong_file_extension diff --git a/awx/main/tests/unit/utils/ansible/playbooks/valid/hello_world.yaml b/awx/main/tests/data/ansible_utils/playbooks/valid/hello_world.yaml similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/valid/hello_world.yaml rename to awx/main/tests/data/ansible_utils/playbooks/valid/hello_world.yaml diff --git a/awx/main/tests/unit/utils/ansible/playbooks/valid/hello_world.yml b/awx/main/tests/data/ansible_utils/playbooks/valid/hello_world.yml similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/valid/hello_world.yml rename to awx/main/tests/data/ansible_utils/playbooks/valid/hello_world.yml diff --git a/awx/main/tests/unit/utils/ansible/playbooks/valid/hosts.yml b/awx/main/tests/data/ansible_utils/playbooks/valid/hosts.yml similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/valid/hosts.yml rename to awx/main/tests/data/ansible_utils/playbooks/valid/hosts.yml diff --git a/awx/main/tests/unit/utils/ansible/playbooks/valid/import.yml b/awx/main/tests/data/ansible_utils/playbooks/valid/import.yml similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/valid/import.yml rename to awx/main/tests/data/ansible_utils/playbooks/valid/import.yml diff --git a/awx/main/tests/unit/utils/ansible/playbooks/valid/include.yml b/awx/main/tests/data/ansible_utils/playbooks/valid/include.yml similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/valid/include.yml rename to awx/main/tests/data/ansible_utils/playbooks/valid/include.yml diff --git a/awx/main/tests/unit/utils/ansible/playbooks/valid/vault.yml b/awx/main/tests/data/ansible_utils/playbooks/valid/vault.yml similarity index 100% rename from awx/main/tests/unit/utils/ansible/playbooks/valid/vault.yml rename to awx/main/tests/data/ansible_utils/playbooks/valid/vault.yml diff --git a/awx/main/tests/unit/utils/ansible/__init__.py b/awx/main/tests/unit/utils/ansible/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/awx/main/tests/unit/utils/ansible/test_ansible.py b/awx/main/tests/unit/utils/ansible/test_ansible.py deleted file mode 100644 index 2d4b10a24b..0000000000 --- a/awx/main/tests/unit/utils/ansible/test_ansible.py +++ /dev/null @@ -1,32 +0,0 @@ -import os -import os.path - -import pytest - -from awx.main.utils.ansible import could_be_playbook, could_be_inventory - -HERE, _ = os.path.split(__file__) - - -@pytest.mark.parametrize('filename', os.listdir(os.path.join(HERE, 'playbooks', 'valid'))) -def test_could_be_playbook(filename): - path = os.path.join(HERE, 'playbooks', 'valid') - assert could_be_playbook(HERE, path, filename).endswith(filename) - - -@pytest.mark.parametrize('filename', os.listdir(os.path.join(HERE, 'playbooks', 'invalid'))) -def test_is_not_playbook(filename): - path = os.path.join(HERE, 'playbooks', 'invalid') - assert could_be_playbook(HERE, path, filename) is None - - -@pytest.mark.parametrize('filename', os.listdir(os.path.join(HERE, 'inventories', 'valid'))) -def test_could_be_inventory(filename): - path = os.path.join(HERE, 'inventories', 'valid') - assert could_be_inventory(HERE, path, filename).endswith(filename) - - -@pytest.mark.parametrize('filename', os.listdir(os.path.join(HERE, 'inventories', 'invalid'))) -def test_is_not_inventory(filename): - path = os.path.join(HERE, 'inventories', 'invalid') - assert could_be_inventory(HERE, path, filename) is None diff --git a/awx/main/tests/unit/utils/test_ansible.py b/awx/main/tests/unit/utils/test_ansible.py new file mode 100644 index 0000000000..40b3e6ac1e --- /dev/null +++ b/awx/main/tests/unit/utils/test_ansible.py @@ -0,0 +1,33 @@ +import os +import os.path + +import pytest + +from awx.main.tests import data +from awx.main.utils.ansible import could_be_playbook, could_be_inventory + +DATA = os.path.join(os.path.dirname(data.__file__), 'ansible_utils') + + +@pytest.mark.parametrize('filename', os.listdir(os.path.join(DATA, 'playbooks', 'valid'))) +def test_could_be_playbook(filename): + path = os.path.join(DATA, 'playbooks', 'valid') + assert could_be_playbook(DATA, path, filename).endswith(filename) + + +@pytest.mark.parametrize('filename', os.listdir(os.path.join(DATA, 'playbooks', 'invalid'))) +def test_is_not_playbook(filename): + path = os.path.join(DATA, 'playbooks', 'invalid') + assert could_be_playbook(DATA, path, filename) is None + + +@pytest.mark.parametrize('filename', os.listdir(os.path.join(DATA, 'inventories', 'valid'))) +def test_could_be_inventory(filename): + path = os.path.join(DATA, 'inventories', 'valid') + assert could_be_inventory(DATA, path, filename).endswith(filename) + + +@pytest.mark.parametrize('filename', os.listdir(os.path.join(DATA, 'inventories', 'invalid'))) +def test_is_not_inventory(filename): + path = os.path.join(DATA, 'inventories', 'invalid') + assert could_be_inventory(DATA, path, filename) is None