[SCM] QCA2 library packaging branch, master, updated. debian/2.0.3-3-5-g1a5a4cf

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=cfed546

The following commit has been merged in the master branch:
commit cfed5466087caf4f26398f4741e20b0d13ad4cec
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 3 13:38:54 2012 +0200

    add pipeunittest_more_wait.diff
    
    increase times of qWait() in the pipeunittest test
    (helps with Hurd)
---
 debian/changelog                           |    2 +
 debian/patches/pipeunittest_more_wait.diff |  105 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 108 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c46faf..5d9ea2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qca2 (2.0.3-4) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Fix the symbols file.
+  * Add pipeunittest_more_wait.diff to increase times of qWait() in the
+    pipeunittest test (helps with Hurd).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Jun 2012 13:28:53 +0200
 
diff --git a/debian/patches/pipeunittest_more_wait.diff b/debian/patches/pipeunittest_more_wait.diff
new file mode 100644
index 0000000..879f355
--- /dev/null
+++ b/debian/patches/pipeunittest_more_wait.diff
@@ -0,0 +1,105 @@
+Author: Pino Toscano <pino at debian.org>
+Description: pipeunittest: raise the qWait() times to 100ms
+ In some cases 1ms can be too few to be able to actually read the data from
+ pipes and propagating the events with signals and timeouts.
+ Raise the waits to 100ms to give enough time without slowing the test too
+ much.
+Last-Update: 2012-06-03
+Forwarded: no
+
+--- a/unittest/pipeunittest/pipeunittest.cpp
++++ b/unittest/pipeunittest/pipeunittest.cpp
+@@ -106,17 +106,17 @@ void PipeUnitTest::readWrite()
+     pipe1.readEnd().enable();
+ 
+     pipe1.writeEnd().write( testData1 );
+-    QTest::qWait(1); // process events
+-    QTest::qWait(1); // process events
++    QTest::qWait(100); // process events
++    QTest::qWait(100); // process events
+     QByteArray out1 = pipe1.readEnd().read(); // read all...
+     QCOMPARE( testData1, out1 );
+ 
+     pipe1.writeEnd().write( testData1 ); // put it back in
+-    QTest::qWait(1); // process events
++    QTest::qWait(100); // process events
+     QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() );
+ 
+     pipe1.writeEnd().write( testData2 ); // add some more data
+-    QTest::qWait(1); // process events
++    QTest::qWait(100); // process events
+     QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size() );
+     QByteArray thisRead = pipe1.readEnd().read(1);
+     QCOMPARE( thisRead, QByteArray("D") );
+@@ -141,17 +141,17 @@ void PipeUnitTest::readWriteSecure()
+     pipe1.readEnd().enable();
+ 
+     pipe1.writeEnd().writeSecure( testData1 );
+-    QTest::qWait(1); // process events
+-    QTest::qWait(1); // process events
++    QTest::qWait(100); // process events
++    QTest::qWait(100); // process events
+     QCA::SecureArray out1 = pipe1.readEnd().readSecure(); // read all...
+     QCOMPARE( testData1, out1 );
+ 
+     pipe1.writeEnd().writeSecure( testData1 ); // put it back in
+-    QTest::qWait(1); // process events
++    QTest::qWait(100); // process events
+     QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() );
+ 
+     pipe1.writeEnd().writeSecure( testData2 ); // add some more data
+-    QTest::qWait(1); // process events
++    QTest::qWait(100); // process events
+     QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size() );
+     QCA::SecureArray thisRead = pipe1.readEnd().readSecure(1);
+     QCOMPARE( thisRead, QCA::SecureArray("D") );
+@@ -187,8 +187,8 @@ void PipeUnitTest::signalTests()
+ 
+     QByteArray data("Far better, it is, to dare mighty things");
+     pipe->writeEnd().write( data );
+-    QTest::qWait(1);
+-    QTest::qWait(1);
++    QTest::qWait(100);
++    QTest::qWait(100);
+     QCOMPARE( readyReadSpy.count(), 1 );
+     QCOMPARE( bytesWrittenSpy.count(), 1 );    
+     // this pulls out the first argument to the first signal as an integer
+@@ -199,11 +199,11 @@ void PipeUnitTest::signalTests()
+     QCOMPARE( closedReadSpy.count(), 0 );
+  
+     pipe->readEnd().close();
+-    QTest::qWait(1);
++    QTest::qWait(100);
+     QCOMPARE( closedWriteSpy.count(), 0 );
+     QCOMPARE( closedReadSpy.count(), 1 );
+     pipe->writeEnd().close();
+-    QTest::qWait(1);
++    QTest::qWait(100);
+     QCOMPARE( closedWriteSpy.count(), 1 );
+     QCOMPARE( closedReadSpy.count(), 1 );
+ }
+@@ -234,8 +234,8 @@ void PipeUnitTest::signalTestsSecure()
+ 
+     QCA::SecureArray data("Far better, it is, to dare mighty things");
+     pipe->writeEnd().writeSecure( data );
+-    QTest::qWait(1);
+-    QTest::qWait(1);
++    QTest::qWait(100);
++    QTest::qWait(100);
+     QCOMPARE( readyReadSpy.count(), 1 );
+     QCOMPARE( bytesWrittenSpy.count(), 1 );    
+     // this pulls out the first argument to the first signal as an integer
+@@ -246,11 +246,11 @@ void PipeUnitTest::signalTestsSecure()
+     QCOMPARE( closedReadSpy.count(), 0 );
+  
+     pipe->readEnd().close();
+-    QTest::qWait(1);
++    QTest::qWait(100);
+     QCOMPARE( closedWriteSpy.count(), 0 );
+     QCOMPARE( closedReadSpy.count(), 1 );
+     pipe->writeEnd().close();
+-    QTest::qWait(1);
++    QTest::qWait(100);
+     QCOMPARE( closedWriteSpy.count(), 1 );
+     QCOMPARE( closedReadSpy.count(), 1 );
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 21f86d2..3f02004 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 define_qca_export.diff
 disable_randomunittest.diff
 fix_build_gcc4.7.diff
+pipeunittest_more_wait.diff

-- 
QCA2 library packaging