From 0b1f92b59f60663834608dcdab4a250d15f6aa8f Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Tue, 10 Jul 2018 18:48:11 +0100
Subject: [PATCH] issue #297: test fixes to match fixed CWD.

---
 tests/ansible/integration/ssh/timeouts.yml  |  9 ++++++++-
 tests/ansible/integration/ssh/variables.yml | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/ansible/integration/ssh/timeouts.yml b/tests/ansible/integration/ssh/timeouts.yml
index 71e41218..0fd416f5 100644
--- a/tests/ansible/integration/ssh/timeouts.yml
+++ b/tests/ansible/integration/ssh/timeouts.yml
@@ -4,7 +4,14 @@
   hosts: test-targets
   tasks:
     - connection: local
-      command: ansible -vvv -i "{{inventory_file}}" test-targets -m custom_python_detect_environment -e ansible_user=mitogen__slow_user -e ansible_password=slow_user_password
+      command: |
+        ansible -vvv
+        -i "{{inventory_file}}"
+        test-targets
+        -m custom_python_detect_environment
+        -e ansible_user=mitogen__slow_user -e ansible_password=slow_user_password
+      args:
+        chdir: ../..
       register: out
       ignore_errors: true
       when: is_mitogen
diff --git a/tests/ansible/integration/ssh/variables.yml b/tests/ansible/integration/ssh/variables.yml
index fd1a610b..110d3340 100644
--- a/tests/ansible/integration/ssh/variables.yml
+++ b/tests/ansible/integration/ssh/variables.yml
@@ -21,6 +21,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_ssh_user=mitogen__has_sudo
         -e ansible_ssh_pass=has_sudo_password
+      args:
+        chdir: ../..
       register: out
       when: is_mitogen
 
@@ -30,6 +32,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_ssh_user=mitogen__has_sudo
         -e ansible_ssh_pass=wrong_password
+      args:
+        chdir: ../..
       register: out
       ignore_errors: true
       when: is_mitogen
@@ -46,6 +50,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_user=mitogen__has_sudo
         -e ansible_ssh_pass=has_sudo_password
+      args:
+        chdir: ../..
       register: out
       when: is_mitogen
 
@@ -55,6 +61,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_user=mitogen__has_sudo
         -e ansible_ssh_pass=wrong_password
+      args:
+        chdir: ../..
       register: out
       ignore_errors: true
       when: is_mitogen
@@ -71,6 +79,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_user=mitogen__has_sudo
         -e ansible_password=has_sudo_password
+      args:
+        chdir: ../..
       register: out
       when: is_mitogen
 
@@ -80,6 +90,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_user=mitogen__has_sudo
         -e ansible_password=wrong_password
+      args:
+        chdir: ../..
       register: out
       ignore_errors: true
       when: is_mitogen
@@ -96,6 +108,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_user=mitogen__has_sudo_pubkey
         -e ansible_ssh_private_key_file=../data/docker/mitogen__has_sudo_pubkey.key
+      args:
+        chdir: ../..
       register: out
       when: is_mitogen
 
@@ -105,6 +119,8 @@
         ansible -m shell -a whoami -i "{{inventory_file}}" test-targets
         -e ansible_user=mitogen__has_sudo
         -e ansible_ssh_private_key_file=/dev/null
+      args:
+        chdir: ../..
       register: out
       ignore_errors: true
       when: is_mitogen