From b1099ce1483359f5ef63c5ea806298c0da2864d7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 16 Feb 2025 12:56:36 +0100 Subject: [PATCH] Adding patch from upstream to fix udev tests with dummy interfaces, thanks to Olivier Gayot (Closes: #1057530). Signed-off-by: Daniel Baumann --- debian/patches/series | 1 + .../upstream/0001-test-dummy-interfaces.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 debian/patches/series create mode 100644 debian/patches/upstream/0001-test-dummy-interfaces.patch diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8ceb28a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +upstream/0001-test-dummy-interfaces.patch diff --git a/debian/patches/upstream/0001-test-dummy-interfaces.patch b/debian/patches/upstream/0001-test-dummy-interfaces.patch new file mode 100644 index 0000000..55eee35 --- /dev/null +++ b/debian/patches/upstream/0001-test-dummy-interfaces.patch @@ -0,0 +1,20 @@ +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 +