stabilize some tests

Author: giampaolo

psutil/tests/__init__.py

@@ -1071,7 +1071,7 @@ def assert_proc_gone(self, proc):
         self.assert_pid_gone(proc.pid)
         ns = process_namespace(proc)
         for fun, name in ns.iter(ns.all, clear_cache=True):
-            with self.subTest(proc=proc, name=name):
+            with self.subTest(proc=str(proc), name=name):
                 try:
                     ret = fun()
                 except psutil.ZombieProcess:
@@ -1109,7 +1109,7 @@ def assert_proc_zombie(self, proc):
         # Call all methods.
         ns = process_namespace(proc)
         for fun, name in ns.iter(ns.all, clear_cache=True):
-            with self.subTest(proc=proc, name=name):
+            with self.subTest(proc=str(proc), name=name):
                 try:
                     fun()
                 except (psutil.ZombieProcess, psutil.AccessDenied) as exc:

psutil/tests/test_misc.py

@@ -255,7 +255,7 @@ def check(ret):
 
         ns = process_namespace(proc)
         for fun, name in ns.iter(ns.getters, clear_cache=True):
-            with self.subTest(proc=proc, name=name):
+            with self.subTest(proc=str(proc), name=name):
                 try:
                     ret = fun()
                 except psutil.Error:

psutil/tests/test_posix.py

@@ -356,23 +356,36 @@ def test_nic_names(self):
                     f" output\n{output}"
                 )
 
-    # @pytest.mark.skipif(CI_TESTING and not psutil.users(),
-    #                     reason="unreliable on CI")
     @retry_on_failure()
     def test_users(self):
         out = sh("who -u")
         if not out.strip():
             raise pytest.skip("no users on this system")
-        lines = out.split('\n')
-        users = [x.split()[0] for x in lines]
-        terminals = [x.split()[1] for x in lines]
-        assert len(users) == len(psutil.users())
-        with self.subTest(psutil=psutil.users(), who=out):
-            for idx, u in enumerate(psutil.users()):
-                assert u.name == users[idx]
-                assert u.terminal == terminals[idx]
-                if u.pid is not None:  # None on OpenBSD
-                    psutil.Process(u.pid)
+
+        susers = []
+        for line in out.splitlines():
+            user = line.split()[0]
+            terminal = line.split()[1]
+            if LINUX or MACOS:
+                try:
+                    pid = int(line.split()[-2])
+                except ValueError:
+                    pid = int(line.split()[-1])
+                susers.append((user, terminal, pid))
+            else:
+                susers.append((user, terminal))
+
+        if LINUX or MACOS:
+            pusers = [(u.name, u.terminal, u.pid) for u in psutil.users()]
+        else:
+            pusers = [(u.name, u.terminal) for u in psutil.users()]
+
+        assert len(susers) == len(pusers)
+        assert sorted(susers) == sorted(pusers)
+
+        for user in psutil.users():
+            if user.pid is not None:
+                assert user.pid > 0
 
     @retry_on_failure()
     def test_users_started(self):

psutil/tests/test_process_all.py

@@ -530,5 +530,4 @@ def check(pid):
                 # Process class and is querable like a PID (process
                 # ID). Skip it.
                 continue
-            with self.subTest(pid=pid):
-                check(pid)
+            check(pid)

psutil/tests/test_unicode.py

@@ -287,7 +287,7 @@ class TestFSAPIsWithInvalidPath(TestFSAPIs):
     funky_suffix = INVALID_UNICODE_SUFFIX
 
     def expect_exact_path_match(self):
-        return True
+        return not MACOS
 
 
 # ===================================================================