flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

on travis do not run tests that require sequential execution (can not run in parallel)

Browse Source
This commit is contained in:
Thomas Waldmann 2014-09-02 00:14:24 +02:00
parent 3d91f9bf81
commit 9bd09b6008
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -27,7 +27,7 @@ install:
- "pip install --use-mirrors Django==$DJANGO" - "pip install --use-mirrors Django==$DJANGO"
- "pip install --use-mirrors -r requirements.d/travis.txt" - "pip install --use-mirrors -r requirements.d/travis.txt"
- "pip install --use-mirrors -e ." - "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: after_success:
- coveralls - coveralls
notifications: notifications:

3
nsupdate/api/_tests/test_api.py
View File

@ -2,6 +2,8 @@
Tests for api package. Tests for api package.
""" """
import pytest
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from nsupdate.main.dnstools import query_ns, FQDN 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' assert response.content == b'nochg 1.2.3.4'
@pytest.mark.requires_sequential
def test_nic_update_authorized_update_other_services(client): def test_nic_update_authorized_update_other_services(client):
response = client.get(reverse('nic_update') + '?myip=4.3.2.1', response = client.get(reverse('nic_update') + '?myip=4.3.2.1',
HTTP_AUTHORIZATION=make_basic_auth_header(TEST_HOST, TEST_SECRET)) HTTP_AUTHORIZATION=make_basic_auth_header(TEST_HOST, TEST_SECRET))