Fix py26 difference in ssl socket connect call from 99ba9d6
This commit is contained in:
parent
14b8e2cf01
commit
cd99821f8a
4 changed files with 35 additions and 1 deletions
|
@ -84,7 +84,10 @@ class CustomHTTPSConnection(httplib.HTTPSConnection):
|
|||
def connect(self):
|
||||
"Connect to a host on a given (SSL) port."
|
||||
|
||||
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()
|
||||
|
|
|
@ -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 }
|
||||
|
|
3
test/integration/roles/test_get_url/meta/main.yml
Normal file
3
test/integration/roles/test_get_url/meta/main.yml
Normal file
|
@ -0,0 +1,3 @@
|
|||
dependencies:
|
||||
- prepare_tests
|
||||
|
27
test/integration/roles/test_get_url/tasks/main.yml
Normal file
27
test/integration/roles/test_get_url/tasks/main.yml
Normal file
|
@ -0,0 +1,27 @@
|
|||
# Test code for the file module.
|
||||
# (c) 2014, Richard Isaacson <richard.c.isaacson@gmail.com>
|
||||
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
- 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'
|
Loading…
Reference in a new issue