3 files changed, 34 insertions, 64 deletions
diff --git a/sources/pyside6/tests/QtScxml/QtScxml.pyproject b/sources/pyside6/tests/QtScxml/QtScxml.pyproject
new file mode 100644
index 000000000..21ee7c9ab
--- /dev/null
+++ b/sources/pyside6/tests/QtScxml/QtScxml.pyproject
@@ -0,0 +1,3 @@
+{
+    "files": ["test_dynamic.py"]
+}
diff --git a/sources/pyside6/tests/QtScxml/test_dynamic.py b/sources/pyside6/tests/QtScxml/test_dynamic.py
index 6c5ae6a35..212d6f7c1 100644
--- a/sources/pyside6/tests/QtScxml/test_dynamic.py
+++ b/sources/pyside6/tests/QtScxml/test_dynamic.py
@@ -1,30 +1,5 @@
-#############################################################################
-##
-## Copyright (C) 2018 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
 
 import os
 import sys
@@ -36,25 +11,42 @@ from init_paths import init_test_paths
 init_test_paths(False)
 
 from helper.timedqapplication import TimedQApplication
-from PySide6.QtCore import QObject, SIGNAL
-from PySide6.QtScxml import QScxmlStateMachine
+from PySide6.QtCore import QCoreApplication, QObject, Slot, SIGNAL, SLOT
+from PySide6.QtScxml import QScxmlStateMachine, QScxmlEvent
+
+
+class Receiver(QObject):
+    def __init__(self):
+        super().__init__()
+        self.eventReceived = False
+        self.reachedStable = False
+
+    @Slot(QScxmlEvent)
+    def handleEvent(self, event):
+        self.eventReceived = True
+
+    @Slot()
+    def slotReachedStable(self):
+        self.reachedStable = True
 
 
 class testDynamicStateMachine(TimedQApplication):
     def setUp(self):
-        super(testDynamicStateMachine, self).setUp()
-        filePath = os.path.join(os.path.dirname(__file__), 'trafficlight.scxml')
-        self.assertTrue(os.path.exists(filePath))
-        self._machine = QScxmlStateMachine.fromFile(filePath)
-        self._machine.reachedStableState.connect(self._reachedStable())
+        super().setUp()
+        filePath = Path(__file__).parent / "trafficlight.scxml"
+        self.assertTrue(filePath.is_file())
+        self._machine = QScxmlStateMachine.fromFile(os.fspath(filePath))
+        self._receiver = Receiver()
+        self._machine.connectToEvent("*", self._receiver,
+                                     SLOT("handleEvent(QScxmlEvent)"))
+        self._machine.reachedStableState.connect(self._receiver.slotReachedStable)
         self.assertTrue(not self._machine.parseErrors())
         self.assertTrue(self._machine)
 
-    def _reachedStable(self):
-        self.app.quit()
-
     def test(self):
         self._machine.start()
+        while not self._receiver.reachedStable and not self._receiver.eventReceived:
+            QCoreApplication.processEvents()
 
 
 if __name__ == '__main__':
diff --git a/sources/pyside6/tests/QtScxml/trafficlight.scxml b/sources/pyside6/tests/QtScxml/trafficlight.scxml
index 1b0fb6e9a..699409e68 100644
--- a/sources/pyside6/tests/QtScxml/trafficlight.scxml
+++ b/sources/pyside6/tests/QtScxml/trafficlight.scxml
@@ -1,32 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/****************************************************************************
-**
-** Copyright (C) 2018 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) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 -->
 <scxml
     xmlns="http://www.w3.org/2005/07/scxml"