aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6/tests/QtCore/qthread_prod_cons_test.py')
-rw-r--r--sources/pyside6/tests/QtCore/qthread_prod_cons_test.py45
1 files changed, 8 insertions, 37 deletions
diff --git a/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py b/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py
index 27178361d..a179c936f 100644
--- a/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py
+++ b/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py
@@ -1,35 +1,10 @@
#!/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
'''Producer-Consumer test/example with QThread'''
+import gc
import logging
import os
from random import random
@@ -116,10 +91,8 @@ class ProducerConsumer(unittest.TestCase):
def tearDown(self):
# Destroy fixtures
del self.app
-
- def finishCb(self):
- # Quits the application
- self.app.exit(0)
+ # PYSIDE-535: Need to collect garbage in PyPy to trigger deletion
+ gc.collect()
def testProdCon(self):
# QThread producer-consumer example
@@ -127,16 +100,14 @@ class ProducerConsumer(unittest.TestCase):
prod = Producer(bucket)
cons = Consumer(bucket)
+ cons.finished.connect(QCoreApplication.quit)
prod.start()
cons.start()
- prod.finished.connect(self.finishCb)
- cons.finished.connect(self.finishCb)
-
self.app.exec()
- prod.wait(50)
- cons.wait(50)
+ self.assertTrue(prod.wait(1000))
+ self.assertTrue(cons.wait(1000))
self.assertEqual(prod.production_list, cons.consumption_list)