Merge pull request #1113 from moreati/ssh-password-tests

tests: Simplify Ansible ssh password tests, test priority

tests/ansible/integration/ssh/all.yml

@@ -1,3 +1,4 @@
 - import_playbook: config.yml
+- import_playbook: password.yml
 - import_playbook: timeouts.yml
 - import_playbook: variables.yml

tests/ansible/integration/ssh/password.yml

@@ -0,0 +1,51 @@
+- name: integration/ssh/password.yml
+  hosts: test-targets[0]
+  gather_facts: false
+  vars:
+    ansible_user: mitogen__user1
+  tasks:
+    - meta: reset_connection
+    - name: ansible_password
+      vars:
+        ansible_password: user1_password
+      ping:
+
+    - meta: reset_connection
+    - name: ansible_ssh_pass
+      vars:
+        ansible_ssh_pass: user1_password
+      ping:
+
+    - meta: reset_connection
+    - name: absent password should fail
+      ping:
+      ignore_errors: true
+      ignore_unreachable: true
+      register: ssh_no_password_result
+    - assert:
+        that:
+          - ssh_no_password_result.unreachable == True
+        fail_msg: ssh_no_password_result={{ ssh_no_password_result }}
+
+    - meta: reset_connection
+    - name: ansible_ssh_pass should override ansible_password
+      ping:
+      vars:
+        ansible_password: wrong
+        ansible_ssh_pass: user1_password
+
+    # Tests that ansible_ssh_pass has priority over ansible_password
+    # and that a wrong password causes a target to be marked unreachable.
+    - meta: reset_connection
+    - name: ansible_password should not override
+      vars:
+        ansible_password: user1_password
+        ansible_ssh_pass: wrong
+      ping:
+      ignore_errors: true
+      ignore_unreachable: true
+      register: ssh_wrong_password_result
+    - assert:
+        that:
+          - ssh_wrong_password_result.unreachable == True
+        fail_msg: ssh_wrong_password_result={{ ssh_wrong_password_result }}

tests/ansible/integration/ssh/variables.yml

@@ -13,134 +13,6 @@
       -o "ControlPath /tmp/mitogen-ansible-test-{{18446744073709551615|random}}"
 
   tasks:
-    - include_tasks: ../_mitogen_only.yml
-
-    - name: ansible_ssh_user, ansible_ssh_pass
-      shell: >
-        ANSIBLE_ANY_ERRORS_FATAL=false
-        ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-        ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
-        ansible -m shell -a whoami
-        {% for inv in ansible_inventory_sources %}
-        -i "{{ inv }}"
-        {% endfor %}
-        test-targets
-        -e ansible_ssh_user=mitogen__has_sudo
-        -e ansible_ssh_pass=has_sudo_password
-      args:
-        chdir: ../..
-      register: out
-
-    - name: ansible_ssh_user, wrong ansible_ssh_pass
-      shell: >
-        ANSIBLE_ANY_ERRORS_FATAL=false
-        ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-        ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
-        ansible -m shell -a whoami
-        {% for inv in ansible_inventory_sources %}
-        -i "{{ inv }}"
-        {% endfor %}
-        test-targets
-        -e ansible_ssh_user=mitogen__has_sudo
-        -e ansible_ssh_pass=wrong_password
-        -e ansible_python_interpreter=python3000
-      args:
-        chdir: ../..
-      register: out
-      ignore_errors: true
-
-    - assert:
-        that:
-          - out.rc == 4  # ansible.executor.task_queue_manager.TaskQueueManager.RUN_UNREACHABLE_HOSTS
-        fail_msg: out={{out}}
-
-
-    - name: ansible_user, ansible_ssh_pass
-      shell: >
-        ANSIBLE_ANY_ERRORS_FATAL=false
-        ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-        ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
-        ansible -m shell -a whoami
-        {% for inv in ansible_inventory_sources %}
-        -i "{{ inv }}"
-        {% endfor %}
-        test-targets
-        -e ansible_user=mitogen__has_sudo
-        -e ansible_ssh_pass=has_sudo_password
-      args:
-        chdir: ../..
-      register: out
-
-    - name: ansible_user, wrong ansible_ssh_pass
-      shell: >
-        ANSIBLE_ANY_ERRORS_FATAL=false
-        ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-        ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
-        ansible -m shell -a whoami
-        {% for inv in ansible_inventory_sources %}
-        -i "{{ inv }}"
-        {% endfor %}
-        test-targets
-        -e ansible_user=mitogen__has_sudo
-        -e ansible_ssh_pass=wrong_password
-        -e ansible_python_interpreter=python3000
-      args:
-        chdir: ../..
-      register: out
-      ignore_errors: true
-
-    - assert:
-        that:
-          - out.rc == 4  # ansible.executor.task_queue_manager.TaskQueueManager.RUN_UNREACHABLE_HOSTS
-        fail_msg: out={{out}}
-
-
-    - name: ansible_user, ansible_password
-      shell: >
-        ANSIBLE_ANY_ERRORS_FATAL=false
-        ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-        ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
-        ansible -m shell -a whoami
-        {% for inv in ansible_inventory_sources %}
-        -i "{{ inv }}"
-        {% endfor %}
-        test-targets
-        -e ansible_user=mitogen__has_sudo
-        -e ansible_password=has_sudo_password
-      args:
-        chdir: ../..
-      register: out
-
-    - name: ansible_user, wrong ansible_password
-      shell: >
-        ANSIBLE_ANY_ERRORS_FATAL=false
-        ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-        ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
-        ansible -m shell -a whoami
-        {% for inv in ansible_inventory_sources %}
-        -i "{{ inv }}"
-        {% endfor %}
-        test-targets
-        -e ansible_user=mitogen__has_sudo
-        -e ansible_password=wrong_password
-        -e ansible_python_interpreter=python3000
-      args:
-        chdir: ../..
-      register: out
-      ignore_errors: true
-
-    - assert:
-        that:
-          - out.rc == 4  # ansible.executor.task_queue_manager.TaskQueueManager.RUN_UNREACHABLE_HOSTS
-        fail_msg: out={{out}}
-
-
     - name: setup ansible_ssh_private_key_file
       shell: chmod 0600 ../data/docker/mitogen__has_sudo_pubkey.key
       args: