diff -Nru dnspython-2.0.0/debian/changelog dnspython-2.0.0/debian/changelog --- dnspython-2.0.0/debian/changelog 2020-08-25 11:49:31.000000000 +0200 +++ dnspython-2.0.0/debian/changelog 2020-09-07 15:43:00.000000000 +0200 @@ -1,3 +1,13 @@ +dnspython (2.0.0-1ubuntu2) groovy; urgency=medium + + * Drop debian/patches/ubuntu-disable-ipv6-udp-tests.patch: + - IPv6 UDP tests are not enough, others (like DOH) failing as well + * Add debian/patches/ubuntu-disable-online-tests.patch: + - Disable all online tests as there are several problems on the Ubuntu + autopkgtest infrastructure (LP: #1892832). + + -- Lukas Märdian Mon, 07 Sep 2020 15:43:00 +0200 + dnspython (2.0.0-1ubuntu1) groovy; urgency=medium * Add debian/patches/ubuntu-disable-ipv6-udp-tests.patch: diff -Nru dnspython-2.0.0/debian/patches/series dnspython-2.0.0/debian/patches/series --- dnspython-2.0.0/debian/patches/series 2020-08-25 11:49:31.000000000 +0200 +++ dnspython-2.0.0/debian/patches/series 2020-09-07 15:43:00.000000000 +0200 @@ -1 +1 @@ -ubuntu-disable-ipv6-udp-tests.patch +ubuntu-disable-online-tests.patch diff -Nru dnspython-2.0.0/debian/patches/ubuntu-disable-ipv6-udp-tests.patch dnspython-2.0.0/debian/patches/ubuntu-disable-ipv6-udp-tests.patch --- dnspython-2.0.0/debian/patches/ubuntu-disable-ipv6-udp-tests.patch 2020-08-25 11:49:31.000000000 +0200 +++ dnspython-2.0.0/debian/patches/ubuntu-disable-ipv6-udp-tests.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -Description: Disable IPv6 testing due to UDP test failures on autopkgtest infra -Author: Łukasz 'sil2100' Zemczak -Forwarded: not-needed - ---- a/tests/test_async.py -+++ b/tests/test_async.py -@@ -50,8 +50,7 @@ - - # Probe for IPv4 and IPv6 - query_addresses = [] --for (af, address) in ((socket.AF_INET, '8.8.8.8'), -- (socket.AF_INET6, '2001:4860:4860::8888')): -+for (af, address) in ((socket.AF_INET, '8.8.8.8'),): - try: - with socket.socket(af, socket.SOCK_DGRAM) as s: - # Connecting a UDP socket is supposed to return ENETUNREACH if ---- a/tests/test_query.py -+++ b/tests/test_query.py -@@ -57,8 +57,7 @@ - - # Probe for IPv4 and IPv6 - query_addresses = [] --for (af, address) in ((socket.AF_INET, '8.8.8.8'), -- (socket.AF_INET6, '2001:4860:4860::8888')): -+for (af, address) in ((socket.AF_INET, '8.8.8.8'),): - try: - with socket.socket(af, socket.SOCK_DGRAM) as s: - # Connecting a UDP socket is supposed to return ENETUNREACH if ---- a/tests/test_doh.py -+++ b/tests/test_doh.py -@@ -36,17 +36,6 @@ - resolver_v4_addresses = ['1.1.1.1', '8.8.8.8', '9.9.9.9'] - except Exception: - pass --try: -- with socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) as s: -- s.connect(('2001:4860:4860::8888', 53)) -- resolver_v6_addresses = [ -- '2606:4700:4700::1111', -- # Google says 404 -- # '2001:4860:4860::8888', -- '2620:fe::11' -- ] --except Exception: -- pass - - KNOWN_ANYCAST_DOH_RESOLVER_URLS = ['https://cloudflare-dns.com/dns-query', - 'https://dns.google/dns-query', diff -Nru dnspython-2.0.0/debian/patches/ubuntu-disable-online-tests.patch dnspython-2.0.0/debian/patches/ubuntu-disable-online-tests.patch --- dnspython-2.0.0/debian/patches/ubuntu-disable-online-tests.patch 1970-01-01 01:00:00.000000000 +0100 +++ dnspython-2.0.0/debian/patches/ubuntu-disable-online-tests.patch 2020-09-07 15:43:00.000000000 +0200 @@ -0,0 +1,61 @@ +Description: Disable online testing due to failures on autopkgtest infra +Author: Lukas Märdian +Forwarded: not-needed +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1892832 +Last-Update: 2020-09-07 + +--- dnspython-2.0.0.orig/tests/test_async.py ++++ dnspython-2.0.0/tests/test_async.py +@@ -41,7 +41,7 @@ except Exception: + + # Some tests require the internet to be available to run, so let's + # skip those if it's not there. +-_network_available = True ++_network_available = False + try: + socket.gethostbyname('dnspython.org') + except socket.gaierror: +--- dnspython-2.0.0.orig/tests/test_doh.py ++++ dnspython-2.0.0/tests/test_doh.py +@@ -54,7 +43,7 @@ KNOWN_ANYCAST_DOH_RESOLVER_URLS = ['http + + # Some tests require the internet to be available to run, so let's + # skip those if it's not there. +-_network_available = True ++_network_available = False + try: + socket.gethostbyname('dnspython.org') + except socket.gaierror: +--- dnspython-2.0.0.orig/tests/test_query.py ++++ dnspython-2.0.0/tests/test_query.py +@@ -38,7 +38,7 @@ import dns.zone + + # Some tests require the internet to be available to run, so let's + # skip those if it's not there. +-_network_available = True ++_network_available = False + try: + socket.gethostbyname('dnspython.org') + except socket.gaierror: +--- dnspython-2.0.0.orig/tests/test_resolver.py ++++ dnspython-2.0.0/tests/test_resolver.py +@@ -31,7 +31,7 @@ import dns.resolver + + # Some tests require the internet to be available to run, so let's + # skip those if it's not there. +-_network_available = True ++_network_available = False + try: + socket.gethostbyname('dnspython.org') + except socket.gaierror: +--- dnspython-2.0.0.orig/tests/test_resolver_override.py ++++ dnspython-2.0.0/tests/test_resolver_override.py +@@ -11,7 +11,7 @@ import dns.resolver + + # Some tests require the internet to be available to run, so let's + # skip those if it's not there. +-_network_available = True ++_network_available = False + try: + socket.gethostbyname('dnspython.org') + except socket.gaierror: