Merge ~xnox/network-manager:ubuntu/master into network-manager:ubuntu/master

[Dimitri John Ledkov]

debian/tests: drop which usage to fix adt failure in jammy

Command which is obsolete, and prints warnings to stderr now. Replace it with python standard library call to shutil.which().

diff --git a/debian/changelog b/debian/changelog
index e250835..1c00736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.32.12-0ubuntu2) jammy; urgency=medium
+
+  * debian/tests: drop which usage to fix adt failure in jammy
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 11 Nov 2021 12:07:34 +0000
+
 network-manager (1.32.12-0ubuntu1) impish; urgency=medium
 
   * New upstream version
diff --git a/debian/tests/network_test_base.py b/debian/tests/network_test_base.py
index 2adbbd4..221aad1 100644
--- a/debian/tests/network_test_base.py
+++ b/debian/tests/network_test_base.py
@@ -15,6 +15,7 @@ import os
 import os.path
 import time
 import tempfile
+import shutil
 import subprocess
 import re
 import unittest
@@ -25,7 +26,7 @@ from glob import glob
 # check availability of programs, and cleanly skip test if they are not
 # available
 for program in ["wpa_supplicant", "hostapd", "dnsmasq", "dhclient"]:
-    if subprocess.call(["which", program], stdout=subprocess.PIPE) != 0:
+    if shutil.which(program) is None:
         sys.stderr.write(
             "%s is required for this test suite, but not available. Skipping\n"
             % program