diff --git a/bin/run-all-tests b/bin/run-all-tests index a7077b5..b5dc601 100755 --- a/bin/run-all-tests +++ b/bin/run-all-tests @@ -5,7 +5,7 @@ set -e # Use Ansible from virtualenv if provided if [[ -f .venv/bin/ansible ]]; then source .venv/bin/activate - pip install molecule docker + pip install molecule docker six fi for role in `find roles/ -name molecule`; do diff --git a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py index 18e4662..d83ada5 100644 --- a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py +++ b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import json import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/confluence_latest/tests/test_default.py b/roles/product_install/molecule/confluence_latest/tests/test_default.py index 9cf0634..72a5adf 100644 --- a/roles/product_install/molecule/confluence_latest/tests/test_default.py +++ b/roles/product_install/molecule/confluence_latest/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import json import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/default/tests/test_default.py b/roles/product_install/molecule/default/tests/test_default.py index dc659f1..82f1205 100644 --- a/roles/product_install/molecule/default/tests/test_default.py +++ b/roles/product_install/molecule/default/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/jira_cached_with_downgrade/tests/test_default.py b/roles/product_install/molecule/jira_cached_with_downgrade/tests/test_default.py index 98cd175..e21a7a2 100644 --- a/roles/product_install/molecule/jira_cached_with_downgrade/tests/test_default.py +++ b/roles/product_install/molecule/jira_cached_with_downgrade/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/jira_cached_with_upgrade/tests/test_default.py b/roles/product_install/molecule/jira_cached_with_upgrade/tests/test_default.py index 4e96866..9e9cc48 100644 --- a/roles/product_install/molecule/jira_cached_with_upgrade/tests/test_default.py +++ b/roles/product_install/molecule/jira_cached_with_upgrade/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/jira_software_latest/tests/test_default.py b/roles/product_install/molecule/jira_software_latest/tests/test_default.py index 5bb9a71..05e48cb 100644 --- a/roles/product_install/molecule/jira_software_latest/tests/test_default.py +++ b/roles/product_install/molecule/jira_software_latest/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/jira_version_from_file/tests/test_default.py b/roles/product_install/molecule/jira_version_from_file/tests/test_default.py index 438dbc3..102cf44 100644 --- a/roles/product_install/molecule/jira_version_from_file/tests/test_default.py +++ b/roles/product_install/molecule/jira_version_from_file/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/jira_version_latest/tests/test_default.py b/roles/product_install/molecule/jira_version_latest/tests/test_default.py index dc659f1..82f1205 100644 --- a/roles/product_install/molecule/jira_version_latest/tests/test_default.py +++ b/roles/product_install/molecule/jira_version_latest/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/jira_version_override/tests/test_default.py b/roles/product_install/molecule/jira_version_override/tests/test_default.py index bf9d37d..a6407d7 100644 --- a/roles/product_install/molecule/jira_version_override/tests/test_default.py +++ b/roles/product_install/molecule/jira_version_override/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/resources/tests/test_common.py b/roles/product_install/molecule/resources/tests/test_common.py index bb85871..a63af19 100644 --- a/roles/product_install/molecule/resources/tests/test_common.py +++ b/roles/product_install/molecule/resources/tests/test_common.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/servicedesk3/tests/test_default.py b/roles/product_install/molecule/servicedesk3/tests/test_default.py index aaa6e3a..2ec583f 100644 --- a/roles/product_install/molecule/servicedesk3/tests/test_default.py +++ b/roles/product_install/molecule/servicedesk3/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/servicedesk4/tests/test_default.py b/roles/product_install/molecule/servicedesk4/tests/test_default.py index a052f2d..dff1ffe 100644 --- a/roles/product_install/molecule/servicedesk4/tests/test_default.py +++ b/roles/product_install/molecule/servicedesk4/tests/test_default.py @@ -1,5 +1,5 @@ import os -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner diff --git a/roles/product_install/molecule/servicedesk_latest/tests/test_default.py b/roles/product_install/molecule/servicedesk_latest/tests/test_default.py index b595161..7168f06 100644 --- a/roles/product_install/molecule/servicedesk_latest/tests/test_default.py +++ b/roles/product_install/molecule/servicedesk_latest/tests/test_default.py @@ -1,6 +1,6 @@ import os import json -import urllib.request +from six.moves import urllib import testinfra.utils.ansible_runner