Merge d5ad382 into 0f7eea8

ansible · Sep 13, 2019 · d5db476 · d5db476
2 parents 0f7eea8 + d5ad382
commit d5db476
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/tests/test_adhoc.py b/tests/test_adhoc.py
@@ -1,5 +1,13 @@
 import pytest
-from _pytest.main import EXIT_OK, EXIT_TESTSFAILED, EXIT_USAGEERROR, EXIT_NOTESTSCOLLECTED, EXIT_INTERRUPTED  # NOQA
+try:
+    from _pytest.main import EXIT_OK, EXIT_TESTSFAILED, EXIT_USAGEERROR, EXIT_NOTESTSCOLLECTED, EXIT_INTERRUPTED  # NOQA
+except ImportError:
+    from _pytest.main import ExitCode
+    EXIT_OK = ExitCode.OK
+    EXIT_TESTSFAILED = ExitCode.TESTS_FAILED
+    EXIT_USAGEERROR = ExitCode.USAGE_ERROR
+    EXIT_INTERRUPTED = ExitCode.INTERRUPTED
+    EXIT_NOTESTSCOLLECTED = ExitCode.NO_TESTS_COLLECTED
 
 
 @pytest.mark.old

diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py
@@ -1,5 +1,9 @@
 import pytest
-from _pytest.main import EXIT_OK
+try:
+    from _pytest.main import EXIT_OK
+except ImportError:
+    from _pytest.main import ExitCode
+    EXIT_OK = ExitCode.OK
 
 
 def test_ansible_adhoc(testdir, option):

diff --git a/tests/test_logging.py b/tests/test_logging.py
@@ -1,8 +1,13 @@
 # -*- coding: utf-8 -*-
 import logging
 from fnmatch import fnmatch
-from _pytest.main import EXIT_OK, EXIT_NOTESTSCOLLECTED, EXIT_INTERRUPTED  # NOQA
-
+try:
+    from _pytest.main import EXIT_OK, EXIT_NOTESTSCOLLECTED, EXIT_INTERRUPTED  # NOQA
+except ImportError:
+    from _pytest.main import ExitCode
+    EXIT_OK = ExitCode.OK
+    EXIT_INTERRUPTED = ExitCode.INTERRUPTED
+    EXIT_NOTESTSCOLLECTED = ExitCode.NO_TESTS_COLLECTED
 
 def assert_fnmatch_lines(lines, matches):
     for match in matches:

diff --git a/tests/test_params.py b/tests/test_params.py
@@ -8,7 +8,15 @@
 except ImportError:
     from unittest import mock
 import re
-from _pytest.main import EXIT_OK, EXIT_TESTSFAILED, EXIT_USAGEERROR, EXIT_NOTESTSCOLLECTED, EXIT_INTERRUPTED
+try:
+    from _pytest.main import EXIT_OK, EXIT_TESTSFAILED, EXIT_USAGEERROR, EXIT_NOTESTSCOLLECTED, EXIT_INTERRUPTED  # NOQA
+except ImportError:
+    from _pytest.main import ExitCode
+    EXIT_OK = ExitCode.OK
+    EXIT_TESTSFAILED = ExitCode.TESTS_FAILED
+    EXIT_USAGEERROR = ExitCode.USAGE_ERROR
+    EXIT_INTERRUPTED = ExitCode.INTERRUPTED
+    EXIT_NOTESTSCOLLECTED = ExitCode.NO_TESTS_COLLECTED
 
 if sys.version_info[0] == 2:
     import __builtin__ as builtins  # NOQA
@@ -35,7 +43,7 @@ def test_plugin_help(testdir):
         '  --become-user=ANSIBLE_BECOME_USER, --ansible-become-user=ANSIBLE_BECOME_USER',
         '  --ask-become-pass=ANSIBLE_ASK_BECOME_PASS, --ansible-ask-become-pass=ANSIBLE_ASK_BECOME_PASS',
         # Check for the marker in --help
-        '  ansible (args) * Ansible integration',
+        '  ansible (args)*Ansible integration',
     ])
 
 
@@ -119,7 +127,7 @@ def test_func({0}):
     assert result.ret == EXIT_INTERRUPTED
     result.stdout.fnmatch_lines([
         'collected 0 items / 1 errors',
-        'E  *UsageError: Missing required parameter --ansible-host-pattern/--host-pattern',
+        '*UsageError: Missing required parameter --ansible-host-pattern/--host-pattern',
     ])