Improved self-cleaning tests.

tests/review_integration.py

@@ -4,24 +4,27 @@ 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='is32', action='store_true')
 parser.add_argument('--session', action='store_true')
 parser.add_argument('--reader', choices=('cthulhu', 'orca'))
 parser.add_argument('--extension-endpoint', 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),
                              *(['--extension-endpoint'] if args.extension_endpoint else []),
                              *(['--reader', args.reader] if args.reader else []),
-                             *(['--32-bit'] if args.is32 else [])]))
+                             *(['--32-bit'] if args.is32 else [])], build, "review_integration",
+                              keep=args.keep, keepOnFailure=args.keepOnFailure))
 busName = 'org.gnome.Orca1.Service' if args.reader == 'orca' else 'org.stormux.Cthulhu1.Service'
 iface = busName.rsplit('.', 1)[0] + '.WineAccess' if args.extension_endpoint else busName
 path = '/' + busName.replace('.', '/') + ('/WineAccess' if args.extension_endpoint else '')
@@ -75,7 +78,7 @@ def request(conn, sender, focus):
               GLib.VariantType.new('(a{sv})'),Gio.DBusCallFlags.NONE,1500,None,finished)
     return result
 
-with tempfile.TemporaryDirectory(prefix='wine-review-wire-') as temporary:
+with wine_test_directory(prefix='wine-review-wire-') as temporary:
     env = os.environ.copy()
     env.update(WINEPREFIX=str(Path(temporary)/'prefix'),WINEDEBUG=os.environ.get('WINE_ACCESS_TEST_DEBUG','-all'),WINEDLLOVERRIDES='mscoree,mshtml=',CTHULHU_WINE_ACCESS_MANAGED='1')
     fixture = build/('review-fixture32.exe' if args.is32 else 'review-fixture64.exe')