Merge pull request #362 from ThomasWaldmann/travis

fixes/updates for travis

nsupdate/main/_tests/test_dnstools.py

@@ -119,11 +119,11 @@ class TestQuery(object):
 
 class TestReverseLookup(object):
     def test_rev_lookup_v4(self):
-        name, ip = '1dot1dot1dot1.cloudflare-dns.com', '1.1.1.1'
+        name, ip = 'one.one.one.one', '1.1.1.1'
         assert rev_lookup(ip) == name
 
     def test_rev_lookup_v6(self):
-        name, ip = '1dot1dot1dot1.cloudflare-dns.com', '2606:4700:4700::1111'
+        name, ip = 'one.one.one.one', '2606:4700:4700::1111'
         assert rev_lookup(ip) == name
 
 

requirements.d/dev.txt

@@ -1,7 +1,7 @@
 # packages needed for development
 -r all.txt
 django-debug-toolbar
-pytest
+pytest>=3.6
 pytest-django
 pytest-pep8
 Sphinx

requirements.d/travis.txt

@@ -2,7 +2,7 @@
 # this is mostly the stuff from dev.txt except a few packages not needed
 # on travis. the desired version of django is installed via .travis.yml.
 django-debug-toolbar
-pytest
+pytest>=3.6
 pytest-django
 pytest-pep8
 coveralls

scripts/travis/install.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# update pkg lists first, existing list items might be 404
+sudo apt-get -y update
+
 # we install a local bind9 to run the tests against:
 sudo apt-get -y install bind9 dnsutils e2fsprogs
 

setup.cfg

@@ -21,7 +21,7 @@ all_files = 1
 [upload_sphinx]
 upload-dir = docs/_build/html
 
-[pytest]
+[tool:pytest]
 DJANGO_SETTINGS_MODULE = nsupdate.settings.dev
 pep8maxlinelength = 120
 norecursedirs = .git