[Python-modules-commits] r12885 - in packages/pyside/trunk/debian/patches (fixTests.patch)

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

    Date: Wednesday, May 12, 2010 @ 12:46:35
  Author: odyx-guest
Revision: 12885

Blacklist qtwebkit_webpage.py test

Modified:
  packages/pyside/trunk/debian/patches/fixTests.patch

Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch	2010-05-12 11:13:30 UTC (rev 12884)
+++ packages/pyside/trunk/debian/patches/fixTests.patch	2010-05-12 12:46:35 UTC (rev 12885)
@@ -1,5 +1,6 @@
 Description: Make sure the tests use the currently built libpyside
- Also correct a typo
+ * Extend timeout to 25
+ * Blacklist some modules
 Author: Didier Raboud <didier at raboud.com>
 Forwarded: http://bugs.openbossa.org/214
 Origin: vendor
@@ -7,20 +8,23 @@
 
 Index: pyside/tests/CMakeLists.txt
 ===================================================================
---- pyside.orig/tests/CMakeLists.txt	2010-05-10 22:10:47.000000000 +0200
-+++ pyside/tests/CMakeLists.txt	2010-05-10 22:21:00.000000000 +0200
-@@ -1,14 +1,17 @@
+--- pyside.orig/tests/CMakeLists.txt	2010-05-11 15:59:46.000000000 +0200
++++ pyside/tests/CMakeLists.txt	2010-05-12 14:44:00.000000000 +0200
+@@ -1,21 +1,28 @@
  
  file(GLOB TEST_FILES */*_test.py)
  
 -set(test_blacklist )
 +# Debian patch
 +# blacklist non-compiled tests: qtmaemo5*
++set(test_blacklist qtmaemo5_qmaemo5import)
 +# blacklist mandelbug tests: qtwebkit_webpage (upstream: #218)
-+set(test_blacklist qtmaemo5_qmaemo5import)
++set(test_dontrun_list qtwebkit_webpage)
  
  foreach(test_file ${TEST_FILES})
      string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
++  list(FIND test_dontrun_list ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} dont_run)
++  if (${dont_run} EQUAL -1)
      list(FIND test_blacklist ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} expect_fail)
      add_test(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} sh
               ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
@@ -29,16 +33,12 @@
               "${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
               ${PYTHON_EXECUTABLE}
               ${test_file})
-Index: pyside/tests/qtwebkit/webpage_test.py
-===================================================================
---- pyside.orig/tests/qtwebkit/webpage_test.py	2010-05-10 22:10:47.000000000 +0200
-+++ pyside/tests/qtwebkit/webpage_test.py	2010-05-10 22:10:51.000000000 +0200
-@@ -39,7 +39,7 @@
-         if ok:
-             self.called = True
- 
--class SetNetworkAccessManaterCase(TimedQApplication):
-+class SetNetworkAccessManagerCase(TimedQApplication):
- 
-     def testSetNetworkAccessManager(self):
-         page = QWebPage()
+-    set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES TIMEOUT 5)
++    set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES TIMEOUT 25)
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES WILL_FAIL TRUE)
+     endif(${expect_fail} GREATER -1)
++  endif(${dont_run} EQUAL -1)
+ # Should set python path here
+ # Looks like it's fixed in 2.8:
+ # http://www.vtk.org/Bug/print_bug_page.php?bug_id=7885