2 files changed, 35 insertions, 1 deletions
diff --git a/unotest/source/python/org/libreoffice/unittest.py b/unotest/source/python/org/libreoffice/unittest.py
new file mode 100644
index 000000000000..364462ed3827
--- /dev/null
+++ b/unotest/source/python/org/libreoffice/unittest.py
@@ -0,0 +1,29 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import gc
+import pyuno
+import unittest
+
+class LoTestResult(unittest.TextTestResult):
+    def stopTestRun(self):
+        # HACK calling gc.collect() to get rid of as many still existing UNO proxies to
+        # SwXTextDocument and friends as possible; those C++ classes' dtors call
+        # Application::GetSolarMutex via sw::UnoImplPtrDeleter, so the dtors must be called before
+        # DeInitVCL in the call to pyuno.private_deinitTestEnvironment(); any remainging proxies
+        # that are still referenced (UnoInProcess' self.xDoc in
+        # unotest/source/python/org/libreoffice/unotest.py, or per-class variables in the various
+        # PythonTests) need to be individually released (each marked as "HACK" in the code):
+        gc.collect()
+        pyuno.private_deinitTestEnvironment()
+
+if __name__ == '__main__':
+    unittest.main(module=None, testRunner=unittest.TextTestRunner(resultclass=LoTestResult))
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py
index 000a148b353f..804ddafc5518 100644
--- a/unotest/source/python/org/libreoffice/unotest.py
+++ b/unotest/source/python/org/libreoffice/unotest.py
@@ -246,7 +246,12 @@ class UnoInProcess:
     def postTest(self):
         assert(self.xContext)
     def tearDown(self):
-        self.xDoc.close(True)
+        if hasattr(self, 'xDoc'):
+            self.xDoc.close(True)
+            # HACK in case self.xDoc holds a UNO proxy to an SwXTextDocument (whose dtor calls
+            # Application::GetSolarMutex via sw::UnoImplPtrDeleter), which would potentially only be
+            # garbage-collected after VCL has already been deinitialized:
+            self.xDoc = None
 
 def simpleInvoke(connection, test):
     try: