From 9bd09b6008e6d9b5d570ed502de182562fad2956 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 2 Sep 2014 00:14:24 +0200 Subject: [PATCH] on travis do not run tests that require sequential execution (can not run in parallel) --- .travis.yml | 2 +- nsupdate/api/_tests/test_api.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25de0c7..10c38f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: - "pip install --use-mirrors Django==$DJANGO" - "pip install --use-mirrors -r requirements.d/travis.txt" - "pip install --use-mirrors -e ." -script: $COVERAGE py.test $TEST_OPTS -k "$TEST_K" +script: $COVERAGE py.test $TEST_OPTS -k "$TEST_K" -m "not requires_sequential" after_success: - coveralls notifications: diff --git a/nsupdate/api/_tests/test_api.py b/nsupdate/api/_tests/test_api.py index 8bec022..3b71ef8 100644 --- a/nsupdate/api/_tests/test_api.py +++ b/nsupdate/api/_tests/test_api.py @@ -2,6 +2,8 @@ Tests for api package. """ +import pytest + from django.core.urlresolvers import reverse from nsupdate.main.dnstools import query_ns, FQDN @@ -112,6 +114,7 @@ def test_nic_update_authorized_myip(client): assert response.content == b'nochg 1.2.3.4' +@pytest.mark.requires_sequential def test_nic_update_authorized_update_other_services(client): response = client.get(reverse('nic_update') + '?myip=4.3.2.1', HTTP_AUTHORIZATION=make_basic_auth_header(TEST_HOST, TEST_SECRET))