42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
|
From eda7abe337e5e37ef8d1d8ff7abdce334fa9bd21 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Friesse <jfriesse@redhat.com>
|
||
|
|
Date: Tue, 29 Sep 2020 14:22:30 +0200
|
||
|
|
Subject: [PATCH] test: Add compatibility with iproute ss command
|
||
|
|
|
||
|
|
ensure_boothd_not_running is now exectured only when single instance is
|
||
|
|
used, but if so, it requires netstat command. Netstat is deprecated for
|
||
|
|
some time and it is slowly disappearing from distributions, so add
|
||
|
|
support for iproute ss command.
|
||
|
|
|
||
|
|
Parameters for both ss and netstat are same, but sadly output differs so
|
||
|
|
both netstat and ss output is matched.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
|
||
|
|
---
|
||
|
|
test/boothtestenv.py.in | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/test/boothtestenv.py.in b/test/boothtestenv.py.in
|
||
|
|
index 26a40cb..8a23615 100644
|
||
|
|
--- a/test/boothtestenv.py.in
|
||
|
|
+++ b/test/boothtestenv.py.in
|
||
|
|
@@ -31,11 +31,13 @@ class BoothTestEnvironment(unittest.TestCase, BoothAssertions):
|
||
|
|
|
||
|
|
def ensure_boothd_not_running(self):
|
||
|
|
# Need to redirect STDERR in case we're not root, in which
|
||
|
|
- # case netstat's -p option causes a warning. However we only
|
||
|
|
+ # case netstat's -p option causes a warning (ss doesn't). However we only
|
||
|
|
# want to kill boothd processes which we own; -p will list the
|
||
|
|
# pid for those and only those, which is exactly what we want
|
||
|
|
# here.
|
||
|
|
- subprocess.call("netstat -tpln 2>&1 | perl -lne 'm,LISTEN\s+(\d+)/boothd, and kill 15, $1'", shell=True)
|
||
|
|
+ subprocess.call("(netstat -tlnp || ss -tlnp) 2>&1 | " +
|
||
|
|
+ "perl -lne '(m,LISTEN\s+(\d+)/boothd, || /\"boothd\".*pid=(\d+)/) and kill 15, $1'",
|
||
|
|
+ shell=True)
|
||
|
|
|
||
|
|
def get_tempfile(self, identity):
|
||
|
|
tf = tempfile.NamedTemporaryFile(
|
||
|
|
--
|
||
|
|
2.18.2
|
||
|
|
|