From c206004084d5fe27b8d1afcbdd94492665a9a3e7 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 30 Sep 2018 20:40:23 +0200 Subject: [PATCH 1/4] run apt-get update first --- scripts/travis/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/travis/install.sh b/scripts/travis/install.sh index c30a332..aea8003 100755 --- a/scripts/travis/install.sh +++ b/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 From fe7b1bc0cb82c9901a2344be188f33e6a7787318 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 30 Sep 2018 20:53:26 +0200 Subject: [PATCH 2/4] 1.1.1.1 == one.one.one.one --- nsupdate/main/_tests/test_dnstools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nsupdate/main/_tests/test_dnstools.py b/nsupdate/main/_tests/test_dnstools.py index 73cc8db..4d419df 100644 --- a/nsupdate/main/_tests/test_dnstools.py +++ b/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 From 73b274b8aeca9629a406888c514a7d63e2301508 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 30 Sep 2018 20:58:51 +0200 Subject: [PATCH 3/4] require pytest >= 3.6 looks like "pluggy" package needs this. --- requirements.d/dev.txt | 2 +- requirements.d/travis.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.d/dev.txt b/requirements.d/dev.txt index 30e958c..8c3992f 100644 --- a/requirements.d/dev.txt +++ b/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 diff --git a/requirements.d/travis.txt b/requirements.d/travis.txt index ae38d83..5c744af 100644 --- a/requirements.d/travis.txt +++ b/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 From 95acf264cf5b4e6b62a0b18c71d9a08ec36b9631 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 30 Sep 2018 21:19:43 +0200 Subject: [PATCH 4/4] use tool:pytest in setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 901b485..e3fc537 100644 --- a/setup.cfg +++ b/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