Improved self-cleaning tests.

tests/reader_stall_integration.py

@@ -7,25 +7,28 @@ import os
 from pathlib import Path
 import subprocess
 import sys
-import tempfile
 import time
 
 from gi.repository import Gio, GLib
 
+from wine_test_environment import add_test_options, run_wine_test, wine_test_directory
+
 parser = argparse.ArgumentParser()
 parser.add_argument("--build-dir", default="build")
 parser.add_argument("--32-bit", dest="is32Bit", action="store_true")
 parser.add_argument("--timeout", action="store_true")
 parser.add_argument("--focus-error", action="store_true")
 parser.add_argument("--session", action="store_true")
+add_test_options(parser)
 args = parser.parse_args()
 build = Path(args.build_dir).resolve()
 if not args.session:
-    sys.exit(subprocess.call(["dbus-run-session", "--", sys.executable, __file__,
+    sys.exit(run_wine_test(["dbus-run-session", "--", sys.executable, __file__,
                               "--session", "--build-dir", str(build),
                               *(["--32-bit"] if args.is32Bit else []),
                               *(["--timeout"] if args.timeout else []),
-                              *(["--focus-error"] if args.focus_error else [])]))
+                              *(["--focus-error"] if args.focus_error else [])], build, "reader_stall_integration",
+                              keep=args.keep, keepOnFailure=args.keepOnFailure))
 
 interface = "org.stormux.Cthulhu1.Service"
 object_path = "/org/stormux/Cthulhu1/Service"
@@ -51,7 +54,7 @@ def pump_until(predicate, seconds):
     raise AssertionError(f"condition timed out; events: {events}")
 
 
-with tempfile.TemporaryDirectory(prefix="wine-reader-stall-") as temporary:
+with wine_test_directory(prefix="wine-reader-stall-") as temporary:
     root = Path(temporary)
     waiting, typed, resume = (root / name for name in ("waiting", "typed", "resume"))
     env = os.environ.copy()