diff options
Diffstat (limited to 'sources/pyside6/tests/QtCore/qthread_signal_test.py')
| -rw-r--r-- | sources/pyside6/tests/QtCore/qthread_signal_test.py | 67 |
1 files changed, 20 insertions, 47 deletions
diff --git a/sources/pyside6/tests/QtCore/qthread_signal_test.py b/sources/pyside6/tests/QtCore/qthread_signal_test.py index c50ec0101..4e312dcc8 100644 --- a/sources/pyside6/tests/QtCore/qthread_signal_test.py +++ b/sources/pyside6/tests/QtCore/qthread_signal_test.py @@ -1,30 +1,5 @@ -############################################################################# -## -## 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 connecting signals between threads''' @@ -37,39 +12,40 @@ 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, QObject, SIGNAL, QCoreApplication +from PySide6.QtCore import QThread, QTimer, QObject, Signal, Slot, QCoreApplication -thread_run = False class Source(QObject): + source = Signal() + def __init__(self, *args): - QObject.__init__(self, *args) + super().__init__(*args) + @Slot() def emit_sig(self): - self.emit(SIGNAL('source()')) + self.source.emit() + class Target(QObject): def __init__(self, *args): - QObject.__init__(self, *args) + super().__init__(*args) self.called = False + @Slot() def myslot(self): self.called = True + class ThreadJustConnects(QThread): def __init__(self, source, *args): - QThread.__init__(self, *args) + super().__init__(*args) self.source = source self.target = Target() def run(self): - global thread_run - thread_run = True - QObject.connect(self.source, SIGNAL('source()'), self.target.myslot) - - while not self.target.called: - pass - + self.source.source.connect(self.target.myslot) + self.source.source.connect(self.quit) + self.exec() class BasicConnection(unittest.TestCase): @@ -81,18 +57,15 @@ class BasicConnection(unittest.TestCase): source = Source() thread = ThreadJustConnects(source) - QObject.connect(thread, SIGNAL('finished()'), lambda: app.exit(0)) + thread.finished.connect(QCoreApplication.quit) thread.start() - while not thread_run: - pass - - source.emit_sig() - - app.exec_() + QTimer.singleShot(50, source.emit_sig) + app.exec() thread.wait() self.assertTrue(thread.target.called) + if __name__ == '__main__': unittest.main() |