diff options
Diffstat (limited to 'tests/qtwebkit/webpage_test.py')
| -rw-r--r-- | tests/qtwebkit/webpage_test.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/qtwebkit/webpage_test.py b/tests/qtwebkit/webpage_test.py index ed98c9f8d..20796971f 100644 --- a/tests/qtwebkit/webpage_test.py +++ b/tests/qtwebkit/webpage_test.py @@ -9,11 +9,15 @@ from PySide.QtNetwork import QNetworkAccessManager from helper import adjust_filename, TimedQApplication +#Define a global timeout because TimedQApplication uses a singleton! +#Use a value big enough to run all the tests. +TIMEOUT = 1000 + class TestFindText(TimedQApplication): '''Test cases for finding text''' def setUp(self): - TimedQApplication.setUp(self, timeout=250) + TimedQApplication.setUp(self, timeout=TIMEOUT) self.page = QWebPage() QObject.connect(self.page, SIGNAL('loadFinished(bool)'), self.load_finished) @@ -27,19 +31,22 @@ class TestFindText(TimedQApplication): def testFindSelectText(self): url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__)) - self.page.currentFrame().setUrl(url) + self.page.mainFrame().load(url) self.app.exec_() self.assert_(self.called) def load_finished(self, ok): #Callback to check if load was successful - self.assert_(self.page.findText('fox')) - self.assertEqual(self.page.selectedText(), 'fox') - self.app.quit() if ok: self.called = True + self.assert_(self.page.findText('fox')) + self.assertEqual(self.page.selectedText(), 'fox') + self.app.quit() -class SetNetworkAccessManaterCase(TimedQApplication): +class SetNetworkAccessManagerCase(TimedQApplication): + + def setUp(self): + TimedQApplication.setUp(self, timeout=TIMEOUT) def testSetNetworkAccessManager(self): page = QWebPage() |