From 71aa687341b8f4c0ad927b4d9fc60a1aaab6eab3 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Mon, 29 Jan 2018 15:09:03 +0100 Subject: Fix error with second Qt.UniqueConnection call The current implementation was considering only Py_True as a success, but not Py_False. The else statement will enter just in case of error, as intended. Added a test case to verify the proper behavior of Qt.UniqueConnection. Task-number: PYSIDE-34 Change-Id: I5bafe0e81383022dcd7fc6251fc61d0ab5e918d0 Reviewed-by: Alexandru Croitor --- sources/pyside2/tests/QtCore/qobject_test.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'sources/pyside2/tests/QtCore') diff --git a/sources/pyside2/tests/QtCore/qobject_test.py b/sources/pyside2/tests/QtCore/qobject_test.py index 482ae78be..bafa8a643 100644 --- a/sources/pyside2/tests/QtCore/qobject_test.py +++ b/sources/pyside2/tests/QtCore/qobject_test.py @@ -34,7 +34,12 @@ import unittest import py3kcompat as py3k -from PySide2.QtCore import QObject +from PySide2.QtCore import QObject, Signal, Qt + +class Obj(QObject): + signal = Signal() + def empty(self): + pass class ObjectNameCase(unittest.TestCase): '''Tests related to QObject object name''' @@ -67,6 +72,12 @@ class ObjectNameCase(unittest.TestCase): obj.setObjectName(name) self.assertEqual(obj.objectName(), name) + def testUniqueConnection(self): + obj = Obj() + # On first connect, UniqueConnection returns True, and on the second + # it must return False, and not a RuntimeError (PYSIDE-34) + self.assertTrue(obj.signal.connect(obj.empty, Qt.UniqueConnection)) + self.assertFalse(obj.signal.connect(obj.empty, Qt.UniqueConnection)) if __name__ == '__main__': unittest.main() -- cgit v1.2.3 From cc7b6beea3e39d8a8d092465621e5674391a692d Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Thu, 15 Feb 2018 09:43:09 +0100 Subject: Add condition to qmimedatabase_test An assert related to a Mimetype comment fails if the language is unset or is not English. Since this assert is not critical to the functionality of the module, we can remove it or add a simple condition to test it only when the system's language is English. The last one was applied. Task-number: PYSIDE-575 Change-Id: Ida85268e25522e406878dd6ac4e5e70852f8d8e4 Reviewed-by: Friedemann Kleint Reviewed-by: Christian Tismer --- sources/pyside2/tests/QtCore/qmimedatabase_test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sources/pyside2/tests/QtCore') diff --git a/sources/pyside2/tests/QtCore/qmimedatabase_test.py b/sources/pyside2/tests/QtCore/qmimedatabase_test.py index 7bd9a4586..4c3ae220d 100644 --- a/sources/pyside2/tests/QtCore/qmimedatabase_test.py +++ b/sources/pyside2/tests/QtCore/qmimedatabase_test.py @@ -34,7 +34,7 @@ import unittest import ctypes import sys -from PySide2.QtCore import QMimeDatabase +from PySide2.QtCore import QMimeDatabase, QLocale class QMimeDatabaseTest(unittest.TestCase): def testMimeTypeForName(self): @@ -43,7 +43,8 @@ class QMimeDatabaseTest(unittest.TestCase): s0 = db.mimeTypeForName("application/x-zerosize") self.assertTrue(s0.isValid()) self.assertEqual(s0.name(), "application/x-zerosize") - self.assertEqual(s0.comment(), "empty document") + if "en" in QLocale().name(): + self.assertEqual(s0.comment(), "empty document") s0Again = db.mimeTypeForName("application/x-zerosize") self.assertEqual(s0Again.name(), s0.name()) -- cgit v1.2.3