[Python-modules-commits] r13114 - in packages/pyside/trunk/debian (4 files)

[odyx-guest at users.alioth.debian.org]

    Date: Thursday, May 27, 2010 @ 21:05:30
  Author: odyx-guest
Revision: 13114

* Patches:
  - Import those hat got merged upstream
    ?\195?\151 fix_Linking.patch
    ?\195?\151 fixDebugPostfix.patch
  - Fix the qtwebkit tests by importing
    + u_fixtestQtWebkitTest_17d9eed.patch from upstream

Added:
  packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch
Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/patches/fixTests.patch
  packages/pyside/trunk/debian/patches/series

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-05-27 20:56:16 UTC (rev 13113)
+++ packages/pyside/trunk/debian/changelog	2010-05-27 21:05:30 UTC (rev 13114)
@@ -3,14 +3,17 @@
   * Testsuite:
     - Blacklist qtnetwork_udpsocket that fails on the buildds
 
-  * Patches: import those hat got merged upstream:
-    - fix_Linking.patch
-       -> u_fixLinking_4326368.patch
-    - fixDebugPostfix.patch
-       -> u_fixConvenienceSymlinks_792456c.patch
-       -> u_fixDebugPostfix_d9b1898.patch
+  * Patches:
+    - Import those hat got merged upstream
+      × fix_Linking.patch
+        -> u_fixLinking_4326368.patch
+      × fixDebugPostfix.patch
+        -> u_fixConvenienceSymlinks_792456c.patch
+        -> u_fixDebugPostfix_d9b1898.patch
+    - Fix the qtwebkit tests by importing
+      + u_fixtestQtWebkitTest_17d9eed.patch from upstream
 
- -- Didier Raboud <didier at raboud.com>  Thu, 27 May 2010 22:55:38 +0200
+ -- Didier Raboud <didier at raboud.com>  Thu, 27 May 2010 23:03:57 +0200
 
 pyside (0.3.1-1) UNRELEASED; urgency=low
 

Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch	2010-05-27 20:56:16 UTC (rev 13113)
+++ packages/pyside/trunk/debian/patches/fixTests.patch	2010-05-27 21:05:30 UTC (rev 13114)
@@ -8,9 +8,9 @@
 
 Index: pyside/tests/CMakeLists.txt
 ===================================================================
---- pyside.orig/tests/CMakeLists.txt	2010-05-27 22:44:39.000000000 +0200
-+++ pyside/tests/CMakeLists.txt	2010-05-27 22:54:15.000000000 +0200
-@@ -1,21 +1,30 @@
+--- pyside.orig/tests/CMakeLists.txt	2010-05-27 22:59:25.000000000 +0200
++++ pyside/tests/CMakeLists.txt	2010-05-27 22:59:49.000000000 +0200
+@@ -1,21 +1,29 @@
  
  file(GLOB TEST_FILES */*_test.py)
  
@@ -19,9 +19,8 @@
 +# blacklist non-compiled tests: qtmaemo5*
 +set(test_blacklist qtmaemo5_qmaemo5import)
 +# blacklist mandelbug tests:
-+# - qtwebkit_webpage (upstream: #218)
 +# - qtnetwork_udpsocket (upstream: #230)
-+set(test_dontrun_list qtwebkit_webpage qtnetwork_udpsocket )
++set(test_dontrun_list qtnetwork_udpsocket )
  
  foreach(test_file ${TEST_FILES})
      string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-05-27 20:56:16 UTC (rev 13113)
+++ packages/pyside/trunk/debian/patches/series	2010-05-27 21:05:30 UTC (rev 13114)
@@ -2,4 +2,5 @@
 u_fixDebugPostfix_d9b1898.patch
 libPythonVersionPostfix.patch
 fixTests.patch
+u_fixtestQtWebkitTest_17d9eed.patch
 u_fixLinking_4326368.patch

Added: packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch	2010-05-27 21:05:30 UTC (rev 13114)
@@ -0,0 +1,80 @@
+From 17f9eed1ad5d04603872f198876047466ba08666 Mon Sep 17 00:00:00 2001
+From: Luciano Wolf <luciano.wolf at openbossa.org>
+Date: Thu, 20 May 2010 22:07:17 -0300
+Subject: [PATCH] Fix bug#218 - TimedQApplication uses a singleton.
+
+It's necessary to use a global TIMEOUT value, big enough to run
+all the tests without killing the QApp.
+
+Reviewer: Hugo Parente Lima <hugo.lima at openbossa.org>
+          Renato Araujo <renato.araujo at openbossa.org>
+---
+ tests/qtwebkit/webpage_test.py |   19 +++++++++++++------
+ tests/qtwebkit/webview_test.py |    2 +-
+ 2 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/tests/qtwebkit/webpage_test.py b/tests/qtwebkit/webpage_test.py
+index ed98c9f..2079697 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()
+diff --git a/tests/qtwebkit/webview_test.py b/tests/qtwebkit/webview_test.py
+index 176d487..e1ba7ef 100644
+--- a/tests/qtwebkit/webview_test.py
++++ b/tests/qtwebkit/webview_test.py
+@@ -14,7 +14,7 @@ class TestLoadFinished(TimedQApplication):
+ 
+     def setUp(self):
+         #Acquire resources
+-        TimedQApplication.setUp(self, timeout=250)
++        TimedQApplication.setUp(self, timeout=1000)
+         self.view = QWebView()
+         QObject.connect(self.view, SIGNAL('loadFinished(bool)'),
+                         self.load_finished)
+-- 
+1.6.1
+