aboutsummaryrefslogtreecommitdiffstats
path: root/sources
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-14 12:32:12 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-14 11:41:09 +0000
commit7b681c84b0970a6d54c11eededf6f93eed8b8782 (patch)
tree9bcc93d7004018e746fc93b0e810b7b832c3e2f4 /sources
parentb825eec459a3d5dcddf14061d578ef89e6ad5ee4 (diff)
Remove QtCore::static_protected_methods_test
The test calls QThread::sleep(), which was static protected in Qt 4, but is public in Qt 5. In addition, the test is flaky on macOS. Task-number: PYSIDE-431 Change-Id: Ie0faae785cda61937b3f20290f1dccbcb20bffda Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources')
-rw-r--r--sources/pyside2/tests/QtCore/CMakeLists.txt1
-rw-r--r--sources/pyside2/tests/QtCore/static_protected_methods_test.py59
2 files changed, 0 insertions, 60 deletions
diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt
index 0a3fda0b..9e66ebc0 100644
--- a/sources/pyside2/tests/QtCore/CMakeLists.txt
+++ b/sources/pyside2/tests/QtCore/CMakeLists.txt
@@ -109,7 +109,6 @@ PYSIDE_TEST(repr_test.py)
PYSIDE_TEST(setprop_on_ctor_test.py)
PYSIDE_TEST(staticMetaObject_test.py)
PYSIDE_TEST(static_method_test.py)
-PYSIDE_TEST(static_protected_methods_test.py)
PYSIDE_TEST(thread_signals_test.py)
PYSIDE_TEST(tr_noop_test.py)
PYSIDE_TEST(translation_test.py)
diff --git a/sources/pyside2/tests/QtCore/static_protected_methods_test.py b/sources/pyside2/tests/QtCore/static_protected_methods_test.py
deleted file mode 100644
index c6339b1f..00000000
--- a/sources/pyside2/tests/QtCore/static_protected_methods_test.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/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 PySide2.
-##
-## $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$
-##
-#############################################################################
-
-'''Unit tests for static protected methods'''
-
-import unittest, time
-
-from PySide2.QtCore import QThread
-
-class Test (QThread):
- def run(self):
- start = time.time()
- self.sleep(1)
- self.time_elapsed = time.time() - start
-
-class QStaticProtectedCall(unittest.TestCase):
- '''Test case for static protected method call'''
-
- def setUp(self):
- pass
-
- def tearDown(self):
- pass
-
- def testPathSeparator(self):
- thread = Test()
- thread.start()
- self.assertTrue(thread.wait(2000))
- self.assertTrue(thread.time_elapsed <= 1.1) # tolarance of 100ms
-
-if __name__ == '__main__':
- unittest.main()