From cd99821f8aa705910f2c6a49c05e2a9a185868a0 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 3 Sep 2014 10:04:02 -0500 Subject: [PATCH] Fix py26 difference in ssl socket connect call from 99ba9d6 --- lib/ansible/module_utils/urls.py | 5 +++- test/integration/non_destructive.yml | 1 + .../roles/test_get_url/meta/main.yml | 3 +++ .../roles/test_get_url/tasks/main.yml | 27 +++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 test/integration/roles/test_get_url/meta/main.yml create mode 100644 test/integration/roles/test_get_url/tasks/main.yml diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py index 7d967e2eb1..ab26b9eb1c 100644 --- a/lib/ansible/module_utils/urls.py +++ b/lib/ansible/module_utils/urls.py @@ -84,7 +84,10 @@ class CustomHTTPSConnection(httplib.HTTPSConnection): def connect(self): "Connect to a host on a given (SSL) port." - sock = socket.create_connection((self.host, self.port), self.timeout, self.source_address) + if hasattr(self, 'source_address'): + sock = socket.create_connection((self.host, self.port), self.timeout, self.source_address) + else: + sock = socket.create_connection((self.host, self.port), self.timeout) if self._tunnel_host: self.sock = sock self._tunnel() diff --git a/test/integration/non_destructive.yml b/test/integration/non_destructive.yml index c8d836896a..619396acb2 100644 --- a/test/integration/non_destructive.yml +++ b/test/integration/non_destructive.yml @@ -37,3 +37,4 @@ - { role: test_failed_when, tags: test_failed_when } - { role: test_script, tags: test_script } - { role: test_authorized_key, tags: test_authorized_key } + - { role: test_get_url, tags: test_get_url } diff --git a/test/integration/roles/test_get_url/meta/main.yml b/test/integration/roles/test_get_url/meta/main.yml new file mode 100644 index 0000000000..1050c23ce3 --- /dev/null +++ b/test/integration/roles/test_get_url/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - prepare_tests + diff --git a/test/integration/roles/test_get_url/tasks/main.yml b/test/integration/roles/test_get_url/tasks/main.yml new file mode 100644 index 0000000000..1aa4b287ea --- /dev/null +++ b/test/integration/roles/test_get_url/tasks/main.yml @@ -0,0 +1,27 @@ +# Test code for the file module. +# (c) 2014, Richard Isaacson + +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +- name: test https fetch + get_url: url="https://raw.githubusercontent.com/ansible/ansible/devel/README.md" dest={{output_dir}}/get_url.txt force=yes + register: result + +- name: assert the get_url call was successful + assert: + that: + - result.changed + - '"OK" in result.msg'