Merge remote-tracking branch 'origin/issue499'

* origin/issue499:
  issue #499: another totally moronic implementation difference
  issue #499: disable new test on vanilla.
  docs: update Changelog; closes #499.
  issue #499: respect C.BECOME_ALLOW_SAME_USER.

ansible_mitogen/connection.py

@@ -587,7 +587,8 @@ class Connection(ansible.plugins.connection.ConnectionBase):
             )
 
         stack += (CONNECTION_METHOD[spec.transport()](spec),)
-        if spec.become():
+        if spec.become() and ((spec.become_user() != spec.remote_user()) or
+                              C.BECOME_ALLOW_SAME_USER):
             stack += (CONNECTION_METHOD[spec.become_method()](spec),)
 
         return stack

docs/changelog.rst

@@ -260,6 +260,9 @@ Fixes
   trigger early finalization of Cython-based extension modules, leading to
   segmentation faults.
 
+* `#499 <https://github.com/dw/mitogen/issues/499>`_: the ``allow_same_user``
+  Ansible configuration setting is respected.
+
 * `dc1d4251 <https://github.com/dw/mitogen/commit/dc1d4251>`_: the
   ``synchronize`` module could fail with the Docker transport due to a missing
   attribute.

tests/ansible/hosts/become_same_user.hosts

@@ -0,0 +1,4 @@
+
+# become_same_user.yml
+bsu-joe ansible_user=joe
+

tests/ansible/integration/action/low_level_execute_command.yml

@@ -22,6 +22,8 @@
       raw: 'whoami'
       register: raw
 
+    - debug: msg="x{{raw}}x"
+
     # Can't test stdout because TTY inserts \r in Ansible version.
     - name: Verify raw module output.
       assert:
@@ -33,6 +35,7 @@
         - |
           raw.stdout_lines|to_text in (
             ["\r\n"],
+            ["", "root"],
             ["root\r\n"],
             ["root"],
           )

tests/ansible/integration/connection/all.yml

@@ -1,5 +1,6 @@
 ---
 
+- include: become_same_user.yml
 - include: disconnect_during_module.yml
 - include: disconnect_resets_connection.yml
 - include: exec_command.yml

tests/ansible/integration/connection/become_same_user.yml

@@ -0,0 +1,39 @@
+# issue #499: ensure C.BECOME_ALLOW_SAME_USER is respected.
+---
+
+- name: integration/connection/become_same_user.yml
+  hosts: bsu-joe
+  gather_facts: no
+  any_errors_fatal: true
+  tasks:
+
+  # bsu-joe's login user is joe, so become should be ignored.
+  - mitogen_get_stack:
+    become: true
+    become_user: joe
+    register: out
+    when: is_mitogen
+
+  - assert:
+      that:
+      - out.result[0].method == "ssh"
+      - out.result[0].kwargs.username == "joe"
+      - out.result|length == 1  # no sudo
+    when: is_mitogen
+
+
+  # Now try with a different account.
+  - mitogen_get_stack:
+    become: true
+    become_user: james
+    register: out
+    when: is_mitogen
+
+  - assert:
+      that:
+      - out.result[0].method == "ssh"
+      - out.result[0].kwargs.username == "joe"
+      - out.result[1].method == "sudo"
+      - out.result[1].kwargs.username == "james"
+      - out.result|length == 2  # no sudo
+    when: is_mitogen