diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-04-03 13:44:51 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-04-09 13:20:13 +0200 |
| commit | 140b7df1263e2d24d1fc69b8ad305e8189d1dadc (patch) | |
| tree | 0f414ea7a55bd8407651ddb0441e0c05ed2e8f79 /sources/pyside6/tests/signals/multiple_connections_test.py | |
| parent | f619b4c45b042c3a656a80b57cb4f154ef15bd1a (diff) | |
Port signals tests to modern syntax
Use the modern syntax where appropriate. Some tests are
left unmodified to at least test the syntax.
As a drive-by, remove the hasQtGui import checks since
widgets should be built when this is run.
Pick-to: 6.7
Task-number: PYSIDE-2646
Change-Id: I9acf07d0b735009f6aff4a55382dae745d855786
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Diffstat (limited to 'sources/pyside6/tests/signals/multiple_connections_test.py')
| -rw-r--r-- | sources/pyside6/tests/signals/multiple_connections_test.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sources/pyside6/tests/signals/multiple_connections_test.py b/sources/pyside6/tests/signals/multiple_connections_test.py index b6aa33f2d..233851797 100644 --- a/sources/pyside6/tests/signals/multiple_connections_test.py +++ b/sources/pyside6/tests/signals/multiple_connections_test.py @@ -11,7 +11,7 @@ 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 QObject, SIGNAL, QProcess +from PySide6.QtCore import QObject, Signal, QProcess from helper.basicpyslotcase import BasicPySlotCase from helper.usesqapplication import UsesQApplication @@ -20,7 +20,7 @@ from helper.usesqapplication import UsesQApplication class MultipleSignalConnections(unittest.TestCase): '''Base class for multiple signal connection testing''' - def run_many(self, sender, signal, emitter, receivers, args=None): + def run_many(self, signal, emitter, receivers, args=None): """Utility method to connect a list of receivers to a signal. sender - QObject that will emit the signal signal - string with the signal signature @@ -33,7 +33,7 @@ class MultipleSignalConnections(unittest.TestCase): args = tuple() for rec in receivers: rec.setUp() - self.assertTrue(QObject.connect(sender, SIGNAL(signal), rec.cb)) + self.assertTrue(signal.connect(rec.cb)) rec.args = tuple(args) emitter(*args) @@ -48,13 +48,14 @@ class PythonMultipleSlots(UsesQApplication, MultipleSignalConnections): def testPythonSignal(self): """Multiple connections to a python signal (short-circuit)""" - class Dummy(QObject): - pass + class Sender(QObject): - sender = Dummy() + foobar = Signal(int) + + sender = Sender() receivers = [BasicPySlotCase() for x in range(10)] - self.run_many(sender, 'foobar(int)', partial(sender.emit, - SIGNAL('foobar(int)')), receivers, (0, )) + self.run_many(sender.foobar, partial(sender.foobar.emit), + receivers, (0, )) class QProcessMultipleSlots(UsesQApplication, MultipleSignalConnections): @@ -67,9 +68,10 @@ class QProcessMultipleSlots(UsesQApplication, MultipleSignalConnections): def start_proc(*args): sender.start(sys.executable, ['-c', '""']) - sender.waitForFinished() + self.assertTrue(sender.waitForStarted()) + self.assertTrue(sender.waitForFinished()) - self.run_many(sender, 'started()', start_proc, receivers) + self.run_many(sender.started, start_proc, receivers) def testQProcessFinished(self): '''Multiple connections to QProcess.finished(int)''' @@ -78,9 +80,10 @@ class QProcessMultipleSlots(UsesQApplication, MultipleSignalConnections): def start_proc(*args): sender.start(sys.executable, ['-c', '""']) - sender.waitForFinished() + self.assertTrue(sender.waitForStarted()) + self.assertTrue(sender.waitForFinished()) - self.run_many(sender, 'finished(int)', start_proc, receivers, (0,)) + self.run_many(sender.finished, start_proc, receivers, (0, QProcess.ExitStatus.NormalExit)) if __name__ == '__main__': |