Merge branch 'master' into multi-word-mask

Author: moreati

.ci/prep_azure.py

@@ -84,6 +84,12 @@
 if need_to_fix_psycopg2:
     venv_steps.append('/tmp/venv/bin/pip3 install psycopg2==2.8.5 psycopg2-binary')
 
+venv_steps.extend([
+    # pbr is a transitive setup_requires of hdrhistogram. If it's not already
+    # installed then setuptools attempts to use easy_install, which fails.
+    '/tmp/venv/bin/pip install pbr==5.6.0',
+])
+
 batches.append(venv_steps)
 
 ci_lib.run_batches(batches)

ansible_mitogen/planner.py

@@ -41,6 +41,7 @@
 import logging
 import os
 import random
+import re
 
 from ansible.executor import module_common
 from ansible.collections.list import list_collection_dirs
@@ -297,11 +298,11 @@ class NewStylePlanner(ScriptPlanner):
     preprocessing the module.
     """
     runner_name = 'NewStyleRunner'
-    marker = b'from ansible.module_utils.'
+    MARKER = re.compile(b'from ansible(?:_collections|\.module_utils)\.')
 
     @classmethod
     def detect(cls, path, source):
-        return cls.marker in source
+        return cls.MARKER.search(source) != None
 
     def _get_interpreter(self):
         return None, None
@@ -321,6 +322,7 @@ def get_module_deps(self):
     ALWAYS_FORK_MODULES = frozenset([
         'dnf',  # issue #280; py-dnf/hawkey need therapy
         'firewalld',  # issue #570: ansible module_utils caches dbus conn
+        'ansible.legacy.dnf',  # issue #776
     ])
 
     def should_fork(self):

docs/changelog.rst

@@ -23,6 +23,7 @@ v0.3.0 (unreleased)
 This release separates itself from the v0.2.X releases. Ansible's API changed too much to support backwards compatibility so from now on, v0.2.X releases will be for Ansible < 2.10 and v0.3.X will be for Ansible 2.10+.
 `See here for details <https://github.com/dw/mitogen pull/715#issuecomment-750697248>`_.
 
+* :gh:issue:`827` NewStylePlanner: detect `ansible_collections` imports
 * :gh:issue:`770` better check for supported Ansible version
 * :gh:issue:`731` ansible 2.10 support
 * :gh:issue:`652` support for ansible collections import hook

tests/ansible/integration/action/copy.yml

@@ -63,6 +63,7 @@
         - stat.results[1].stat.checksum == "62951f943c41cdd326e5ce2b53a779e7916a820d"
         - stat.results[2].stat.checksum == "b26dd6444595e2bdb342aa0a91721b57478b5029"
         - stat.results[3].stat.checksum == "d675f47e467eae19e49032a2cc39118e12a6ee72"
+        fail_msg: stat={{stat}}
 
     - file:
         state: absent

tests/ansible/integration/action/fixup_perms2__copy.yml

@@ -21,6 +21,7 @@
     - assert:
         that:
         -  out.stat.mode in ("0644", "0664")
+        fail_msg: out={{out}}
 
     #
     # copy module (explicit mode).
@@ -37,6 +38,7 @@
     - assert:
         that:
         -  out.stat.mode == "0400"
+        fail_msg: out={{out}}
 
     #
     # copy module (existing disk files, no mode).
@@ -63,6 +65,7 @@
     - assert:
         that:
         - out.stat.mode in ("0644", "0664")
+        fail_msg: out={{out}}
 
     #
     # copy module (existing disk files, preserve mode).
@@ -79,6 +82,7 @@
     - assert:
         that:
         - out.stat.mode == "1462"
+        fail_msg: out={{out}}
 
     #
     # copy module (existing disk files, explicit mode).
@@ -96,6 +100,7 @@
     - assert:
         that:
         - out.stat.mode == "1461"
+        fail_msg: out={{out}}
 
     - file:
         state: absent

tests/ansible/integration/action/low_level_execute_command.yml

@@ -16,6 +16,7 @@
           - 'raw.rc == 0'
           - 'raw.stdout_lines[-1]|to_text == "2"'
           - 'raw.stdout[-1]|to_text == "2"'
+        fail_msg: raw={{raw}}
 
     - name: Run raw module with sudo
       become: true
@@ -39,3 +40,4 @@
             ["root\r\n"],
             ["root"],
           )
+        fail_msg: raw={{raw}}

tests/ansible/integration/action/make_tmp_path.yml

@@ -44,11 +44,13 @@
       assert:
         that:
         - good_temp_path == good_temp_path2
+        fail_msg: good_temp_path={{good_temp_path}} good_temp_path2={{good_temp_path2}}
 
     - name: "Verify different subdir for both tasks"
       assert:
         that:
         - tmp_path.path != tmp_path2.path
+        fail_msg: tmp_path={{tmp_path}} tmp_path2={{tmp_path2}}
 
     #
     # Verify subdirectory removal.
@@ -69,6 +71,7 @@
         that:
         - not stat1.stat.exists
         - not stat2.stat.exists
+        fail_msg: stat1={{stat1}} stat2={{stat2}}
 
     #
     # Verify good directory persistence.
@@ -83,6 +86,7 @@
       assert:
         that:
         - stat.stat.exists
+        fail_msg: stat={{stat}}
 
     #
     # Write some junk into the temp path.
@@ -105,6 +109,7 @@
     - assert:
         that:
         - not out.stat.exists
+        fail_msg: out={{out}}
 
     #
     # root
@@ -123,6 +128,7 @@
         that:
         - tmp_path2.path != tmp_path_root.path
         - tmp_path2.path|dirname != tmp_path_root.path|dirname
+        fail_msg: tmp_path_root={{tmp_path_root}} tmp_path2={{tmp_path2}}
 
     #
     # readonly homedir
@@ -153,3 +159,4 @@
         that:
         - out.module_path.startswith(good_temp_path2)
         - out.module_tmpdir.startswith(good_temp_path2)
+        fail_msg: out={{out}}

tests/ansible/integration/action/remote_expand_user.yml

@@ -27,6 +27,7 @@
       register: out
     - assert:
         that: out.result == '{{user_facts.ansible_facts.ansible_user_dir}}/foo'
+        fail_msg: out={{out}}
 
     - name: "Expand ~/foo with become active. ~ is become_user's home."
       action_passthrough:
@@ -49,6 +50,7 @@
       register: out
     - assert:
         that: out.result == '{{user_facts.ansible_facts.ansible_user_dir}}/foo'
+        fail_msg: out={{out}}
 
     - name: "Expanding $HOME/foo has no effect."
       action_passthrough:
@@ -59,6 +61,7 @@
       register: out
     - assert:
         that: out.result == '$HOME/foo'
+        fail_msg: out={{out}}
 
     # ------------------------
 
@@ -71,6 +74,7 @@
       register: out
     - assert:
         that: out.result == '{{user_facts.ansible_facts.ansible_user_dir}}/foo'
+        fail_msg: out={{out}}
 
     - name: "sudoable; Expand ~/foo with become active. ~ is become_user's home."
       action_passthrough:
@@ -94,6 +98,7 @@
       register: out
     - assert:
         that: out.result == '{{user_facts.ansible_facts.ansible_user_dir}}/foo'
+        fail_msg: out={{out}}
 
     - name: "sudoable; Expanding $HOME/foo has no effect."
       action_passthrough:
@@ -104,3 +109,4 @@
       register: out
     - assert:
         that: out.result == '$HOME/foo'
+        fail_msg: out={{out}}

tests/ansible/integration/action/remote_file_exists.yml

@@ -15,6 +15,7 @@
 
     - assert:
         that: out.result == False
+        fail_msg: out={{out}}
 
     # ---
 
@@ -29,6 +30,7 @@
 
     - assert:
         that: out.result == True
+        fail_msg: out={{out}}
 
     - file:
         path: /tmp/does-exist

tests/ansible/integration/action/remove_tmp_path.yml

@@ -23,6 +23,7 @@
     - assert:
         that:
         - not out2.stat.exists
+        fail_msg: out={{out}}
 
     - stat:
         path: "{{out.src|dirname}}"
@@ -31,6 +32,7 @@
     - assert:
         that:
         - not out2.stat.exists
+        fail_msg: out={{out}}
 
     - file:
         path: /tmp/remove_tmp_path_test