Adding upstream version 2.10.7+merged+base+2.10.8+dfsg.upstream/2.10.7+merged+base+2.10.8+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 27 insertions, 0 deletions

diff --git a/test/integration/targets/pkg_resources/aliases b/test/integration/targets/pkg_resources/aliases
new file mode 100644
index 00000000..a6dafcf8
--- /dev/null
+++ b/test/integration/targets/pkg_resources/aliases
@@ -0,0 +1 @@
+shippable/posix/group1
diff --git a/test/integration/targets/pkg_resources/lookup_plugins/check_pkg_resources.py b/test/integration/targets/pkg_resources/lookup_plugins/check_pkg_resources.py
new file mode 100644
index 00000000..9f1c5c0b
--- /dev/null
+++ b/test/integration/targets/pkg_resources/lookup_plugins/check_pkg_resources.py
@@ -0,0 +1,23 @@
+"""
+This test case verifies that pkg_resources imports from ansible plugins are functional.
+
+If pkg_resources is not installed this test will succeed.
+If pkg_resources is installed but is unable to function, this test will fail.
+
+One known failure case this test can detect is when ansible declares a __requires__ and then tests are run without an egg-info directory.
+"""
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+# noinspection PyUnresolvedReferences
+try:
+    from pkg_resources import Requirement
+except ImportError:
+    Requirement = None
+
+from ansible.plugins.lookup import LookupBase
+
+
+class LookupModule(LookupBase):
+    def run(self, terms, variables=None, **kwargs):
+        return []
diff --git a/test/integration/targets/pkg_resources/tasks/main.yml b/test/integration/targets/pkg_resources/tasks/main.yml
new file mode 100644
index 00000000..b19d0ebd
--- /dev/null
+++ b/test/integration/targets/pkg_resources/tasks/main.yml
@@ -0,0 +1,3 @@
+- name: Verify that pkg_resources imports are functional
+  debug:
+    msg: "{{ lookup('check_pkg_resources') }}"