diff options
Diffstat (limited to 'sources/pyside6/tests/QtCore/qthread_test.py')
| -rw-r--r-- | sources/pyside6/tests/QtCore/qthread_test.py | 91 |
1 files changed, 28 insertions, 63 deletions
diff --git a/sources/pyside6/tests/QtCore/qthread_test.py b/sources/pyside6/tests/QtCore/qthread_test.py index 13c92b6f7..4d26e0597 100644 --- a/sources/pyside6/tests/QtCore/qthread_test.py +++ b/sources/pyside6/tests/QtCore/qthread_test.py @@ -1,32 +1,6 @@ #!/usr/bin/python - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the test suite of Qt for Python. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 '''Test cases for QThread''' @@ -39,12 +13,10 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1])) from init_paths import init_test_paths init_test_paths(False) -from PySide6.QtCore import QThread, QCoreApplication, QObject, SIGNAL, QMutex, QTimer +from PySide6.QtCore import QThread, QCoreApplication, QObject, QTimer, Slot from PySide6.QtCore import QEventLoop -from helper.usesqcoreapplication import UsesQCoreApplication - -mutex = QMutex() +from helper.usesqapplication import UsesQApplication class Dummy(QThread): @@ -56,20 +28,17 @@ class Dummy(QThread): def run(self): # Start-quit sequence self.qobj = QObject() - mutex.lock() self.called = True - mutex.unlock() -class QThreadSimpleCase(UsesQCoreApplication): +class QThreadSimpleCase(UsesQApplication): def setUp(self): - UsesQCoreApplication.setUp(self) + UsesQApplication.setUp(self) + self._started_called = False + self._finished_called = False self.called = False - def tearDown(self): - UsesQCoreApplication.tearDown(self) - def testThread(self): # Basic QThread test obj = Dummy() @@ -78,41 +47,37 @@ class QThreadSimpleCase(UsesQCoreApplication): self.assertTrue(obj.called) - def cb(self, *args): - self.called = True - # self.exit_app_cb() - + @Slot() def abort_application(self): if self._thread.isRunning(): + print("Warning: terminating thread", file=sys.stderr) self._thread.terminate() self.app.quit() - def testSignalFinished(self): - # QThread.finished() (signal) - obj = Dummy() - obj.finished.connect(self.cb) - mutex.lock() - obj.start() - mutex.unlock() - - self._thread = obj - QTimer.singleShot(1000, self.abort_application) - self.app.exec() + @Slot() + def finished(self): + self._finished_called = True - self.assertTrue(self.called) + @Slot() + def started(self): + self._started_called = True - def testSignalStarted(self): - # QThread.started() (signal) - obj = Dummy() - obj.started.connect(self.cb) - obj.start() + def testSignals(self): + # QThread.finished() (signal) + self._thread = Dummy() + self._thread.started.connect(self.started) + self._thread.finished.connect(self.finished) + self._thread.finished.connect(self.app.quit) - self._thread = obj + QTimer.singleShot(50, self._thread.start) QTimer.singleShot(1000, self.abort_application) + self.app.exec() + if self._thread.isRunning(): + self._thread.wait(100) - self.assertEqual(obj.qobj.thread(), obj) # test QObject.thread() method - self.assertTrue(self.called) + self.assertTrue(self._started_called) + self.assertTrue(self._finished_called) if __name__ == '__main__': |