diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt deleted file mode 100644 index caf22179..00000000 --- a/tests/sanity/ignore-2.12.txt +++ /dev/null @@ -1,2 +0,0 @@ -tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt deleted file mode 100644 index caf22179..00000000 --- a/tests/sanity/ignore-2.13.txt +++ /dev/null @@ -1,2 +0,0 @@ -tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt deleted file mode 100644 index caf22179..00000000 --- a/tests/sanity/ignore-2.14.txt +++ /dev/null @@ -1,2 +0,0 @@ -tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt deleted file mode 100644 index caf22179..00000000 --- a/tests/sanity/ignore-2.15.txt +++ /dev/null @@ -1,2 +0,0 @@ -tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt deleted file mode 100644 index caf22179..00000000 --- a/tests/sanity/ignore-2.16.txt +++ /dev/null @@ -1,2 +0,0 @@ -tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/utils/shippable/check_matrix.py b/tests/utils/shippable/check_matrix.py index c130655d..f89ef19a 100755 --- a/tests/utils/shippable/check_matrix.py +++ b/tests/utils/shippable/check_matrix.py @@ -1,5 +1,7 @@ -#!/usr/bin/env python -"""Verify the currently executing Shippable test matrix matches the one defined in the "shippable.yml" file.""" +#!/usr/bin/env python3 + +"""Verify the currently executing Shippable test matrix matches the one defined in the "shippable.yml" file. +""" import datetime @@ -8,19 +10,13 @@ import re import sys import time +from urllib.request import urlopen try: from typing import NoReturn except ImportError: NoReturn = None -try: - # noinspection PyCompatibility - from urllib2 import urlopen # pylint: disable=ansible-bad-import-from -except ImportError: - # noinspection PyCompatibility - from urllib.request import urlopen - def main(): # type: () -> None """Main entry point.""" diff --git a/tests/utils/shippable/sanity.sh b/tests/utils/shippable/sanity.sh index 30504f22..27ec9637 100755 --- a/tests/utils/shippable/sanity.sh +++ b/tests/utils/shippable/sanity.sh @@ -26,4 +26,5 @@ ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHA --docker --base-branch "${base_branch}" \ --exclude plugins/module_utils/vendor/ \ --exclude scripts/ \ + --exclude tests/utils/ \ --allow-disabled diff --git a/tests/utils/shippable/timing.py b/tests/utils/shippable/timing.py index e8f4799a..adfd5b4f 100755 --- a/tests/utils/shippable/timing.py +++ b/tests/utils/shippable/timing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.7 +#!/usr/bin/env python3 import sys