diff options
Diffstat (limited to 'sources/pyside2/tests')
4 files changed, 27 insertions, 6 deletions
diff --git a/sources/pyside2/tests/QtCore/bug_686.py b/sources/pyside2/tests/QtCore/bug_686.py index 6e4f8994a..d944cafe8 100644 --- a/sources/pyside2/tests/QtCore/bug_686.py +++ b/sources/pyside2/tests/QtCore/bug_686.py @@ -49,6 +49,7 @@ class MyWriteThread(QThread): self.started = True while not self.lock.tryLockForWrite(): pass + self.lock.unlock() self.canQuit = True class MyReadThread(QThread): @@ -62,6 +63,7 @@ class MyReadThread(QThread): self.started = True while not self.lock.tryLockForRead(): pass + self.lock.unlock() self.canQuit = True class MyMutexedThread(QThread): diff --git a/sources/pyside2/tests/QtCore/qsettings_test.py b/sources/pyside2/tests/QtCore/qsettings_test.py index 639f6d276..a9f42a5d5 100644 --- a/sources/pyside2/tests/QtCore/qsettings_test.py +++ b/sources/pyside2/tests/QtCore/qsettings_test.py @@ -38,7 +38,7 @@ init_test_paths(False) from helper.helper import adjust_filename import py3kcompat as py3k -from PySide2.QtCore import QSettings +from PySide2.QtCore import QDir, QSettings, QTemporaryDir class TestQSettings(unittest.TestCase): def testConversions(self): @@ -59,7 +59,11 @@ class TestQSettings(unittest.TestCase): def testDefaultValueConversion(self): - settings = QSettings('foo.ini', QSettings.IniFormat) + temp_dir = QDir.tempPath() + dir = QTemporaryDir('{}/qsettings_XXXXXX'.format(temp_dir)) + self.assertTrue(dir.isValid()) + file_name = dir.filePath('foo.ini') + settings = QSettings(file_name, QSettings.IniFormat) settings.setValue('zero_value', 0) settings.setValue('empty_list', []) settings.setValue('bool1', False) @@ -67,7 +71,7 @@ class TestQSettings(unittest.TestCase): del settings # Loading values already set - settings = QSettings('foo.ini', QSettings.IniFormat) + settings = QSettings(file_name, QSettings.IniFormat) # Getting value that doesn't exist r = settings.value("variable") diff --git a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py index af6e5f5d5..32fd432e8 100644 --- a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py +++ b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py @@ -88,5 +88,18 @@ class QtDataVisualizationTestCase(UsesQGuiApplication): QTimer.singleShot(500, self.app.quit) self.app.exec_() + def testBarDataProxy(self): + '''PSYSIDE-1438, crashes in QBarDataProxy.addRow()''' + items = [QtDataVisualization.QBarDataItem(v) for v in [1.0, 2.0]] + data_proxy = QtDataVisualization.QBarDataProxy() + data_proxy.addRow(items) + data_proxy.addRow(items, 'bla') + data_proxy.insertRow(0, items) + data_proxy.insertRow(0, items, 'bla') + data_proxy.setRow(0, items) + data_proxy.setRow(0, items, 'bla') + self.assertTrue(data_proxy.rowCount(), 4) + + if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py index c9b5c16a5..4db0a0a6e 100644 --- a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py +++ b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py @@ -47,7 +47,9 @@ class QPixmapQDatastream(UsesQApplication): def setUp(self): super(QPixmapQDatastream, self).setUp() self.source_pixmap = QPixmap(100, 100) - self.source_pixmap.fill(Qt.red) + # PYSIDE-1533: Use Qt.transparent to force Format_ARGB32_Premultiplied + # when converting to QImage in any case. + self.source_pixmap.fill(Qt.transparent) self.output_pixmap = QPixmap() self.buffer = QByteArray() self.read_stream = QDataStream(self.buffer, QIODevice.ReadOnly) @@ -60,8 +62,8 @@ class QPixmapQDatastream(UsesQApplication): image = self.output_pixmap.toImage() pixel = image.pixel(10,10) - self.assertEqual(pixel, QColor(Qt.red).rgba()) - self.assertEqual(self.source_pixmap.toImage(), self.output_pixmap.toImage()) + self.assertEqual(pixel, QColor(Qt.transparent).rgba()) + self.assertEqual(self.source_pixmap.toImage(), image) if __name__ == '__main__': |