diff options
Diffstat (limited to 'sources/pyside6/tests/QtCore/bug_686.py')
| -rw-r--r-- | sources/pyside6/tests/QtCore/bug_686.py | 58 |
1 files changed, 23 insertions, 35 deletions
diff --git a/sources/pyside6/tests/QtCore/bug_686.py b/sources/pyside6/tests/QtCore/bug_686.py index e4c027ee1..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 @@ -50,8 +25,8 @@ class MyWriteThread(QThread): self.started = True while not self.lock.tryLockForWrite(): pass - self.lock.unlock() self.canQuit = True + self.lock.unlock() class MyReadThread(QThread): @@ -65,8 +40,8 @@ class MyReadThread(QThread): self.started = True while not self.lock.tryLockForRead(): pass - self.lock.unlock() self.canQuit = True + self.lock.unlock() class MyMutexedThread(QThread): @@ -93,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): @@ -106,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): @@ -119,12 +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() |