issue #536: connection_delegation/ tests were erroneously broken

While fixing delegate_to, this un-hardwiring of /usr/bin/python happened. It was always incorrect.
6 years ago · 1d43e187e8
parent 0dfcf5560b
commit 1d43e187e8
4 changed files with 18 additions and 18 deletions
--- a/tests/ansible/integration/connection_delegation/delegate_to_template.yml
+++ b/tests/ansible/integration/connection_delegation/delegate_to_template.yml
@ -39,7 +39,7 @@
              'identity_file': null,
              'password': null,
              'port': null,
-              'python_path': null,
+              'python_path': ["/usr/bin/python"],
              'ssh_args': [
                '-o',
                'UserKnownHostsFile=/dev/null',
@ -66,7 +66,7 @@
              'identity_file': null,
              'password': null,
              'port': null,
-              'python_path': null,
+              'python_path': ["/usr/bin/python"],
              'ssh_args': [
                '-o',
                'UserKnownHostsFile=/dev/null',
--- a/tests/ansible/integration/connection_delegation/local_action.yml
+++ b/tests/ansible/integration/connection_delegation/local_action.yml
@ -15,7 +15,7 @@
        right: [
          {
            'kwargs': {
-              'python_path': null
+              'python_path': ["{{ansible_playbook_python}}"],
            },
            'method': 'local',
          },
@ -23,7 +23,7 @@
            'enable_lru': true,
            'kwargs': {
              'connect_timeout': 10,
-              'python_path': null,
+              'python_path': ["{{ansible_playbook_python}}"],
              'password': null,
              'username': 'root',
              'sudo_path': null,
--- a/tests/ansible/integration/connection_delegation/osa_delegate_to_self.yml
+++ b/tests/ansible/integration/connection_delegation/osa_delegate_to_self.yml
@ -24,7 +24,7 @@
            'lxc_info_path': null,
            'lxc_path': null,
            'machinectl_path': null,
-            'python_path': null,
+            'python_path': ["/usr/bin/python"],
            'username': 'ansible-cfg-remote-user',
          },
          'method': 'setns',
--- a/tests/ansible/integration/connection_delegation/stack_construction.yml
+++ b/tests/ansible/integration/connection_delegation/stack_construction.yml
@ -43,7 +43,7 @@
              "connect_timeout": 10,
              "doas_path": null,
              "password": null,
-              "python_path": null,
+              "python_path": ["/usr/bin/python"],
              "username": "normal-user",
            },
            "method": "doas",
@ -72,7 +72,7 @@
                      'identity_file': null,
                      'password': null,
                      'port': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'ssh_args': [
                          '-o',
                          'UserKnownHostsFile=/dev/null',
@ -112,7 +112,7 @@
                      'identity_file': null,
                      'password': null,
                      'port': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'ssh_args': [
                          '-o',
                          'UserKnownHostsFile=/dev/null',
@ -147,7 +147,7 @@
                      'connect_timeout': 10,
                      'doas_path': null,
                      'password': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'username': 'normal-user',
                  },
                  'method': 'doas',
@ -162,7 +162,7 @@
                      'identity_file': null,
                      'password': null,
                      'port': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'ssh_args': [
                          '-o',
                          'UserKnownHostsFile=/dev/null',
@ -202,7 +202,7 @@
                      'identity_file': null,
                      'password': null,
                      'port': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'ssh_args': [
                          '-o',
                          'UserKnownHostsFile=/dev/null',
@ -229,7 +229,7 @@
                      'identity_file': null,
                      'password': null,
                      'port': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'ssh_args': [
                          '-o',
                          'UserKnownHostsFile=/dev/null',
@ -264,7 +264,7 @@
                      'connect_timeout': 10,
                      'doas_path': null,
                      'password': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'username': 'normal-user',
                  },
                  'method': 'doas',
@ -279,7 +279,7 @@
                      'identity_file': null,
                      'password': null,
                      'port': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'ssh_args': [
                          '-o',
                          'UserKnownHostsFile=/dev/null',
@ -320,7 +320,7 @@
                      'identity_file': null,
                      'password': null,
                      'port': null,
-                      'python_path': null,
+                      "python_path": ["/usr/bin/python"],
                      'ssh_args': [
                          '-o',
                          'UserKnownHostsFile=/dev/null',
@ -352,7 +352,7 @@
        right: [
          {
            'kwargs': {
-              'python_path': null
+              "python_path": ["{{ansible_playbook_python}}"],
            },
            'method': 'local',
          },
@ -374,7 +374,7 @@
              'connect_timeout': 10,
              'doas_path': null,
              'password': null,
-              'python_path': null,
+              'python_path': ["/usr/bin/python"],
              'username': 'normal-user',
            },
            'method': 'doas',
@ -384,7 +384,7 @@
              'connect_timeout': 10,
              'doas_path': null,
              'password': null,
-              'python_path': null,
+              'python_path': ["/usr/bin/python"],
              'username': 'newuser-doas-normal-user',
            },
            'method': 'doas',