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

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Tue Jun 22 07:20:39 UTC 2010 

    Date: Tuesday, June 22, 2010 @ 07:20:30
  Author: odyx-guest
Revision: 13535

* Patches:
  + u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
    This fixes the QtNetwork_udpsocket test to work on offline
    machines, like our buildds.
  ?\195?\151 Refresh fixTests.patch to remove the meaningless testnumbers.

Added:
  packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.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-06-22 04:11:33 UTC (rev 13534)
+++ packages/pyside/trunk/debian/changelog	2010-06-22 07:20:30 UTC (rev 13535)
@@ -1,3 +1,13 @@
+pyside (0.3.2-3) unstable; urgency=low
+
+  * Patches:
+    + u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
+      This fixes the QtNetwork_udpsocket test to work on offline
+      machines, like our buildds.
+    × Refresh fixTests.patch to remove the meaningless testnumbers.
+
+ -- Didier Raboud <didier at raboud.com>  Tue, 22 Jun 2010 09:19:21 +0200
+
 pyside (0.3.2-2) unstable; urgency=low
 
   * Run all tests but don't make them critical.

Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch	2010-06-22 04:11:33 UTC (rev 13534)
+++ packages/pyside/trunk/debian/patches/fixTests.patch	2010-06-22 07:20:30 UTC (rev 13535)
@@ -8,8 +8,8 @@
 
 Index: pyside/tests/CMakeLists.txt
 ===================================================================
---- pyside.orig/tests/CMakeLists.txt	2010-06-17 15:07:01.000000000 +0200
-+++ pyside/tests/CMakeLists.txt	2010-06-18 09:21:56.000000000 +0200
+--- pyside.orig/tests/CMakeLists.txt	2010-06-21 13:51:49.000000000 +0200
++++ pyside/tests/CMakeLists.txt	2010-06-21 13:53:50.000000000 +0200
 @@ -1,10 +1,31 @@
  
  file(GLOB TEST_FILES */*_test.py)
@@ -17,23 +17,23 @@
 -set(test_blacklist )
 +# Debian patch
 +# blacklist non-compiled tests (upstream: #239)
-+#        138 - qtmaemo5_pickselector
-+#        139 - qtmaemo5_qmaemo5import
-+#        144 - qtopengl_qglbuffer
-+#        145 - qtdeclarative_qdeclarativenetwork
-+#        146 - qtdeclarative_qdeclarativeview
-+#set(test_blacklist qtmaemo5_pickselector qtmaemo5_qmaemo5import qtopengl_qglbuffer qtdeclarative_qdeclarativenetwork qtdeclarative_qdeclarativeview)
++#        qtdeclarative_qdeclarativenetwork
++#        qtdeclarative_qdeclarativeview
++#        qtmaemo5_pickselector
++#        qtmaemo5_qmaemo5import
++#        qtopengl_qglbuffer
++#set(test_blacklist qtdeclarative_qdeclarativenetwork qtdeclarative_qdeclarativeview qtmaemo5_pickselector qtmaemo5_qmaemo5import qtopengl_qglbuffer)
 +set(test_blacklist "")
 +
 +# Don't run other bugs:
-+#         74 - qtmultimedia_audio (upstream: #240)
++#        qtgui_qwidget (upstream: #243)
++# Segmentation fault
++#        qtmultimedia_audio (upstream: #240)
 +# python2.6: pcm_params.c:2348: sndrv_pcm_hw_params: Assertion `err >= 0' failed.
 +# Aborted
-+#         83 - qtgui_qwidget (upstream: #243)
-+# Segmentation fault
-+#        122 - qtnetwork_udpsocket (upstream: #230)
++#        qtnetwork_udpsocket (upstream: #230)
 +# AttributeError
-+# set(test_dontrun_list qtmultimedia_audio qtgui_qwidget qtnetwork_udpsocket)
++# set(test_dontrun_list qtgui_qwidget qtmultimedia_audio qtnetwork_udpsocket)
 +set(test_dontrun_list "")
  
  foreach(test_file ${TEST_FILES})

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-06-22 04:11:33 UTC (rev 13534)
+++ packages/pyside/trunk/debian/patches/series	2010-06-22 07:20:30 UTC (rev 13535)
@@ -1,3 +1,4 @@
+u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
 libPythonVersionPostfix.patch
 fixTests.patch
 lessBuildVerbosity.patch

Added: packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.patch	2010-06-22 07:20:30 UTC (rev 13535)
@@ -0,0 +1,68 @@
+From 5ce7c945367f1d673a25666c1cc3ab300b23df49 Mon Sep 17 00:00:00 2001
+From: Renato Filho <renato.filho at openbossa.org>
+Date: Thu, 17 Jun 2010 18:49:12 -0300
+Subject: [PATCH] Fixed udpsocket to work on offline computer.
+
+Reviewed: Marcelo Lira <marcelo.lira at openbossa.org>
+          Luciano Wolf <luciano.wolf at openbossa.org>
+---
+ tests/qtnetwork/udpsocket_test.py |   25 +++++++++++--------------
+ 1 files changed, 11 insertions(+), 14 deletions(-)
+
+diff --git a/tests/qtnetwork/udpsocket_test.py b/tests/qtnetwork/udpsocket_test.py
+index 26cff7f..66f8920 100644
+--- a/tests/qtnetwork/udpsocket_test.py
++++ b/tests/qtnetwork/udpsocket_test.py
+@@ -14,16 +14,13 @@ class HttpSignalsCase(unittest.TestCase):
+ 
+     def setUp(self):
+         #Acquire resources
++        self.called = False
+         self.app = QCoreApplication([])
++
+         self.socket = QUdpSocket()
+-        self.socket.bind(45454)
++
+         self.server = QUdpSocket()
+-        self.timer = QTimer.singleShot(1000, self.app.quit)
+-        self.a = QTimer.singleShot(100, self.broadcast)
+-        #self.a = QTimer()
+-        #self.a.setInterval(100)
+-        #QObject.connect(self.a, SIGNAL('timeout()'), self.broadcast)
+-        #self.a.start()
++        self.server.bind(QHostAddress(QHostAddress.LocalHost), 45454)
+ 
+     def tearDown(self):
+         #Release resources
+@@ -31,21 +28,21 @@ class HttpSignalsCase(unittest.TestCase):
+         del self.server
+         del self.app
+ 
+-    def broadcast(self):
+-        addr = QHostAddress(QHostAddress.Broadcast)
+-        self.server.writeDatagram('datagram', addr, 45454)
++    def sendPackage(self):
++        addr = QHostAddress(QHostAddress.LocalHost)
++        self.socket.writeDatagram('datagram', addr, 45454)
+ 
+     def callback(self):
+-        while self.socket.hasPendingDatagrams():
+-            datagram, host, port = self.socket.readDatagram(
+-                        self.socket.pendingDatagramSize())
++        while self.server.hasPendingDatagrams():
++            datagram, host, port = self.server.readDatagram(self.server.pendingDatagramSize())
+             self.called = True
+             self.app.quit()
+ 
+     def testDefaultArgs(self):
+         #QUdpSocket.readDatagram pythonic return
+         # @bug 124
+-        QObject.connect(self.socket, SIGNAL('readyRead()'), self.callback)
++        QObject.connect(self.server, SIGNAL('readyRead()'), self.callback)
++        self.sendPackage()
+         self.app.exec_()
+ 
+         self.assert_(self.called)
+-- 
+1.6.1
+

More information about the Python-modules-commits mailing list