From d533baa4ddfa5edd6f549630c076e8c55821b0e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 17 Mar 2025 07:28:07 +0100 Subject: [PATCH] Removing test-dummy-interfaces.patch, included upstream. Signed-off-by: Daniel Baumann --- debian/patches/series | 1 - .../upstream/0001-test-dummy-interfaces.patch | 20 ------------------- 2 files changed, 21 deletions(-) delete mode 100644 debian/patches/upstream/0001-test-dummy-interfaces.patch diff --git a/debian/patches/series b/debian/patches/series index 9ebe5cf..337d068 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -upstream/0001-test-dummy-interfaces.patch upstream/0002-skip-esoteric-interfaces.patch diff --git a/debian/patches/upstream/0001-test-dummy-interfaces.patch b/debian/patches/upstream/0001-test-dummy-interfaces.patch deleted file mode 100644 index 55eee35..0000000 --- a/debian/patches/upstream/0001-test-dummy-interfaces.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Martin Belanger -Description: test: Fix test-udev with dummy interfaces - https://github.com/linux-nvme/nvme-stas/issues/407 - https://github.com/linux-nvme/nvme-stas/commit/371c1e875a9a660adca241265e4cd460ee7e5e5c - -diff -Naurp nvme-stas.orig/test/test-udev.py nvme-stas/test/test-udev.py ---- nvme-stas.orig/test/test-udev.py -+++ nvme-stas/test/test-udev.py -@@ -295,6 +295,11 @@ class Test(unittest.TestCase): - def test__cid_matches_tid(self): - ifaces = iputil.net_if_addrs() - for ifname, addrs in self.ifaces.items(): -+ # contains a subset of the interfaces found in . -+ # So, let's make sure that we only test with the interfaces found in both. -+ if ifname not in ifaces: -+ continue -+ - ############################################## - # IPV4 -