aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-07-21 17:44:57 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:54:38 -0300
commit81f264913e25fde7f539a4f40b664040c5baca76 (patch)
tree17419fc101ee6db8dc48624fa46ce57720260e58
parentf10f4f70d4ffe21ace185db5da4ce4ab0fba9b34 (diff)
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 faba8c951..91619c8a6 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 e47819ff7..1cb40faa4 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)