Improved self-cleaning tests.

tests/diagnostics_test.py

@@ -9,20 +9,23 @@ from pathlib import Path
 import shutil
 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", type=Path, default=Path("build"))
 parser.add_argument("--session", action="store_true")
+add_test_options(parser)
 args = parser.parse_args()
 buildDir = args.build_dir.resolve()
 if not args.session:
-    sys.exit(subprocess.call(["dbus-run-session", "--", sys.executable, __file__,
-                              "--session", "--build-dir", str(buildDir)]))
+    sys.exit(run_wine_test(["dbus-run-session", "--", sys.executable, __file__,
+                              "--session", "--build-dir", str(buildDir)], buildDir, "diagnostics_test",
+                              keep=args.keep, keepOnFailure=args.keepOnFailure))
 
 busName = "org.stormux.Cthulhu1.Service"
 objectPath = "/org/stormux/Cthulhu1/Service"
@@ -39,7 +42,7 @@ def record(connection, sender, path, interface, method, parameters, invocation):
     invocation.return_value(GLib.Variant("(b)", (True,)))
 
 
-with tempfile.TemporaryDirectory(prefix="wine-access-diagnostics-") as temporary:
+with wine_test_directory(prefix="wine-access-diagnostics-") as temporary:
     testDir = Path(temporary)
     env = os.environ.copy()
     env.update(WINEPREFIX=str(testDir / "prefix"), WINEDEBUG="-all",