diff options
Diffstat (limited to 'sources/pyside6/tests/signals/signal_across_threads.py')
| -rw-r--r-- | sources/pyside6/tests/signals/signal_across_threads.py | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/sources/pyside6/tests/signals/signal_across_threads.py b/sources/pyside6/tests/signals/signal_across_threads.py index c16ec4db7..91b1ca986 100644 --- a/sources/pyside6/tests/signals/signal_across_threads.py +++ b/sources/pyside6/tests/signals/signal_across_threads.py @@ -1,30 +1,5 @@ -############################################################################# -## -## Copyright (C) 2020 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 case for PYSIDE-1354: Ensure that slots are invoked from the receiver's thread context when using derived classes (and thus, a global receiver).''' @@ -39,12 +14,12 @@ from init_paths import init_test_paths init_test_paths(False) from PySide6.QtCore import QObject, QThread, QTimer, Slot -from helper.usesqcoreapplication import UsesQCoreApplication +from helper.usesqapplication import UsesQApplication class ReceiverBase(QObject): def __init__(self, parent=None): - super(ReceiverBase, self).__init__(parent) + super().__init__(parent) self.senderThread = None @Slot() @@ -58,15 +33,15 @@ class Receiver(ReceiverBase): class TestThread(QThread): def __init__(self, parent=None): - super(TestThread, self).__init__(parent) + super().__init__(parent) def run(self): pass -class SignalAcrossThreads(UsesQCoreApplication): +class SignalAcrossThreads(UsesQApplication): def setUp(self): - UsesQCoreApplication.setUp(self) + UsesQApplication.setUp(self) self._timer_tick = 0 self._timer = QTimer() self._timer.setInterval(20) @@ -74,7 +49,7 @@ class SignalAcrossThreads(UsesQCoreApplication): self._worker_thread = TestThread() def tearDown(self): - UsesQCoreApplication.tearDown(self) + UsesQApplication.tearDown(self) @Slot() def _control_test(self): @@ -97,7 +72,7 @@ class SignalAcrossThreads(UsesQCoreApplication): self._worker_thread.started.connect(main_thread_receiver.slot_function) self._timer.start() - self.app.exec_() + self.app.exec() self.assertEqual(worker_thread_receiver.senderThread, self._worker_thread) self.assertEqual(main_thread_receiver.senderThread, main_thread) |