diff options
| author | Matt Clay <matt@mystile.com> | 2016-10-31 15:11:56 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2016-10-31 15:45:10 -0700 |
| commit | e24588902f95f4ef407b0b4769a9b99b2faf6854 (patch) | |
| tree | 0fc6352c05fe1944da2d52cf723e77d1fe4df854 /Makefile | |
| parent | a0f1dcbd0fdcc1afb4eb4d435ceb20b4f38770f2 (diff) | |
| download | ansible-e24588902f95f4ef407b0b4769a9b99b2faf6854.tar.gz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |