Move test_os_server and apply fixes.

- Add missing meta value for test_create_server
- Add .gitignore for pytest .cache directory

Exclude test_os_server from nose test runs since it was designed
for pytest. The test will work correctly when run using pytest.

This is a temporary issue, as we'll be moving to pytest soon.
This commit is contained in:
Matt Clay 2016-10-31 15:11:56 -07:00
parent a0f1dcbd0f
commit e24588902f
4 changed files with 6 additions and 3 deletions

1
.gitignore vendored
View file

@ -54,6 +54,7 @@ credentials.yml
*.out
.coverage
.tox
.cache
results.xml
coverage.xml
/test/units/cover-html

View file

@ -106,10 +106,10 @@ NOSETESTS3 ?= nosetests-3.5
all: clean python
tests:
PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase
PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase -e test_os_server
tests-py3:
PYTHONPATH=./lib $(NOSETESTS3) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase
PYTHONPATH=./lib $(NOSETESTS3) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase -e test_os_server
integration:
test/utils/shippable/integration.sh

View file

@ -4,7 +4,7 @@ import yaml
import inspect
import collections
from cloud.openstack import os_server
from ansible.modules.core.cloud.openstack import os_server
class AnsibleFail(Exception):
@ -180,6 +180,8 @@ class TestCreateServer(object):
flavor: m1.tiny
nics:
- net-name: network1
meta:
- key: value
'''
with pytest.raises(AnsibleExit):
os_server._create_server(self.module, self.cloud)