diff options
Diffstat (limited to 'sources/pyside6/tests/QtCore/bug_686.py')
-rw-r--r-- | sources/pyside6/tests/QtCore/bug_686.py | 70 |
1 files changed, 33 insertions, 37 deletions
diff --git a/sources/pyside6/tests/QtCore/bug_686.py b/sources/pyside6/tests/QtCore/bug_686.py index d6394bb90..6425a4b86 100644 --- a/sources/pyside6/tests/QtCore/bug_686.py +++ b/sources/pyside6/tests/QtCore/bug_686.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 import os import sys @@ -35,11 +10,13 @@ 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 * +from PySide6.QtCore import (QMutex, QMutexLocker, QReadLocker, QReadWriteLock, + QThread, QWriteLocker) + class MyWriteThread(QThread): def __init__(self, lock): - QThread.__init__(self) + super().__init__() self.lock = lock self.started = False self.canQuit = False @@ -49,10 +26,12 @@ class MyWriteThread(QThread): while not self.lock.tryLockForWrite(): pass self.canQuit = True + self.lock.unlock() + class MyReadThread(QThread): def __init__(self, lock): - QThread.__init__(self) + super().__init__() self.lock = lock self.started = False self.canQuit = False @@ -62,10 +41,12 @@ class MyReadThread(QThread): while not self.lock.tryLockForRead(): pass self.canQuit = True + self.lock.unlock() + class MyMutexedThread(QThread): def __init__(self, mutex): - QThread.__init__(self) + super().__init__() self.mutex = mutex self.started = False self.canQuit = False @@ -77,6 +58,7 @@ class MyMutexedThread(QThread): self.mutex.unlock() self.canQuit = True + class TestQMutex (unittest.TestCase): def testReadLocker(self): @@ -86,10 +68,10 @@ class TestQMutex (unittest.TestCase): with QReadLocker(lock): thread.start() while not thread.started: - pass + QThread.msleep(10) self.assertFalse(thread.canQuit) - thread.wait(2000) + self.assertTrue(thread.wait(2000)) self.assertTrue(thread.canQuit) def testWriteLocker(self): @@ -99,10 +81,10 @@ class TestQMutex (unittest.TestCase): with QWriteLocker(lock): thread.start() while not thread.started: - pass + QThread.msleep(10) self.assertFalse(thread.canQuit) - thread.wait(2000) + self.assertTrue(thread.wait(2000)) self.assertTrue(thread.canQuit) def testMutexLocker(self): @@ -112,11 +94,25 @@ class TestQMutex (unittest.TestCase): with QMutexLocker(mutex): thread.start() while not thread.started: - pass + QThread.msleep(10) self.assertFalse(thread.canQuit) - thread.wait(2000) + self.assertTrue(thread.wait(2000)) self.assertTrue(thread.canQuit) + def testWithAsLocker(self): + lock = QReadWriteLock() + with QReadLocker(lock) as locker: + self.assertTrue(isinstance(locker, QReadLocker)) + with QWriteLocker(lock) as locker: + self.assertTrue(isinstance(locker, QWriteLocker)) + mutex = QMutex() + with QMutexLocker(mutex) as locker: + self.assertTrue(isinstance(locker, QMutexLocker)) + with self.assertRaises(TypeError): + with QMutexLocker(lock) as locker: + pass + + if __name__ == '__main__': unittest.main() |