make test more reliable on win

giampaolo · Oct 6, 2024 · 838107e · 838107e
1 parent 6fe9be9
commit 838107e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
@@ -939,6 +939,7 @@ def main(*args, **kw):  # noqa ARG004
             UserWarning,
             stacklevel=1,
         )
+        return suite
 
     @staticmethod
     def raises(exc, match=None):

diff --git a/psutil/tests/test_testutils.py b/psutil/tests/test_testutils.py
@@ -486,20 +486,18 @@ def test_main(self):
             pass
         with open(os.path.join(tmpdir, "test_file.py"), "w") as f:
             f.write(textwrap.dedent("""\
-                import unittest, os
+                import unittest
 
                 class TestCase(unittest.TestCase):
-                    def test_foo(self):
-                        path = os.path.join("{}", "hello.txt")
-                        with open(path, "w") as f:
-                            pass
-                """.format(tmpdir)).lstrip())
+                    def test_passed(self):
+                        pass
+                """).lstrip())
         with mock.patch.object(psutil.tests, "HERE", tmpdir):
             with self.assertWarnsRegex(
                 UserWarning, "Fake pytest module was used"
             ):
-                fake_pytest.main()
-        call_until(lambda: os.path.isfile(os.path.join(tmpdir, "hello.txt")))
+                suite = fake_pytest.main()
+                assert suite.countTestCases() == 1
 
     def test_warns(self):
         # success