Undo previous travis/tox fixes and fix underlying issue
This commit is contained in:
parent
7c332b63dc
commit
13b8a57d3d
3 changed files with 6 additions and 6 deletions
|
@ -7,8 +7,8 @@ addons:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
- deadsnakes
|
- deadsnakes
|
||||||
#packages:
|
packages:
|
||||||
# - python2.4
|
- python2.4
|
||||||
install:
|
install:
|
||||||
- pip install tox PyYAML Jinja2 sphinx
|
- pip install tox PyYAML Jinja2 sphinx
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -122,9 +122,9 @@ def connect_to_api(module, disconnect_atexit=True):
|
||||||
if disconnect_atexit:
|
if disconnect_atexit:
|
||||||
atexit.register(connect.Disconnect, service_instance)
|
atexit.register(connect.Disconnect, service_instance)
|
||||||
return service_instance.RetrieveContent()
|
return service_instance.RetrieveContent()
|
||||||
except vim.fault.InvalidLogin as invalid_login:
|
except vim.fault.InvalidLogin, invalid_login:
|
||||||
module.fail_json(msg=invalid_login.msg, apierror=str(invalid_login))
|
module.fail_json(msg=invalid_login.msg, apierror=str(invalid_login))
|
||||||
except requests.ConnectionError as connection_error:
|
except requests.ConnectionError, connection_error:
|
||||||
module.fail_json(msg="Unable to connect to vCenter or ESXi API on TCP/443.", apierror=str(connection_error))
|
module.fail_json(msg="Unable to connect to vCenter or ESXi API on TCP/443.", apierror=str(connection_error))
|
||||||
|
|
||||||
|
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -9,12 +9,12 @@ whitelist_externals = make
|
||||||
[testenv:py26]
|
[testenv:py26]
|
||||||
commands =
|
commands =
|
||||||
python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' .
|
python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' .
|
||||||
#python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils
|
python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils
|
||||||
make tests
|
make tests
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
make
|
make
|
||||||
#python2.4
|
python2.4
|
||||||
|
|
||||||
[testenv:py27]
|
[testenv:py27]
|
||||||
commands =
|
commands =
|
||||||
|
|
Loading…
Reference in a new issue