summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-07-21 17:44:57 -0300
committerRenato Filho <renato.filho@openbossa.org>2011-07-22 11:51:44 -0300
commit55fb3a133d860523e289d8a56bf7ab05bbd404d6 (patch)
tree9b2f259848e432e504f1fcd41c974a848b6d48f1
parent3c2505a6254e9446c06dcbc27e5b9d0d8b4316bf (diff)
downloadpyside-55fb3a133d860523e289d8a56bf7ab05bbd404d6.tar.gz
pyside-55fb3a133d860523e289d8a56bf7ab05bbd404d6.tar.xz
pyside-55fb3a133d860523e289d8a56bf7ab05bbd404d6.zip
Fixed unit test for bug_847 mandelbug.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org> Lauro Neto <lauro.neto@openbossa.org>
-rw-r--r--tests/QtDeclarative/bug_847.py7
-rw-r--r--tests/QtDeclarative/bug_847.qml2
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/QtDeclarative/bug_847.py b/tests/QtDeclarative/bug_847.py
index faba8c9..91619c8 100644
--- a/tests/QtDeclarative/bug_847.py
+++ b/tests/QtDeclarative/bug_847.py
@@ -4,14 +4,12 @@
# Released under the same terms as PySide itself
# 2011-05-04 Thomas Perl <m@thp.io>
-
import unittest
from PySide.QtCore import Slot, Signal, QUrl
-from PySide.QtGui import QApplication
from PySide.QtDeclarative import QDeclarativeView
-from helper import adjust_filename, TimedQApplication
+from helper import adjust_filename, UsesQApplication
class View(QDeclarativeView):
def __init__(self):
@@ -26,9 +24,10 @@ class View(QDeclarativeView):
called = Signal(int, int)
-class TestQML(TimedQApplication):
+class TestQML(UsesQApplication):
def done(self, x, y):
self._sucess = True
+ self.app.quit()
def testPythonSlot(self):
self._sucess = False
diff --git a/tests/QtDeclarative/bug_847.qml b/tests/QtDeclarative/bug_847.qml
index e47819f..1cb40fa 100644
--- a/tests/QtDeclarative/bug_847.qml
+++ b/tests/QtDeclarative/bug_847.qml
@@ -15,7 +15,7 @@ Rectangle {
}
Timer {
- interval: 1; running: true;
+ interval: 100; running: true;
onTriggered: {
if (pythonObject != undefined) {
pythonObject.blubb(42, 84)