From 3902bb7a45f6266c51e01eddcda4e25b34814957 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 13 Mar 2017 09:17:21 +0100 Subject: Revert "comphelper: fix MSVC hang in ThreadPool::shutdown()" As it causes "unopkg.bin: /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/comphelper/source/misc/threadpool.cxx:96: comphelper::ThreadPool::~ThreadPool(): Assertion `mbTerminate' failed." in and also locally. Revert till it's clear if that assert() should be a SAL_WARN() or unopkg has to be fixed. This reverts commit 9899ffd244dd367ba69dffe1f21f4f0222064a46. Change-Id: I72902f7da410012340aa8231d84c6871a3f7b976 --- unotest/source/python/org/libreoffice/unotest.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'unotest/source/python') diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 38c6b2266b31..13b00845bb36 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -182,9 +182,6 @@ class UnoInProcess: global havePonies if not(havePonies): pyuno.private_initTestEnvironment() - # note: this will be called early enough, from Py_Finalize - import atexit - atexit.register(pyuno.private_initTestEnvironment, False) havePonies = True def openEmptyWriterDoc(self): assert(self.xContext) -- cgit