[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.11.3-2-22-gb17a5bf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=163d723

The following commit has been merged in the master branch:
commit 163d723a4d8710789ad33ae5b63bda55d55a5706
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jan 14 11:04:56 2014 -0300

    New patch: fix_kptyprocesstest.diff
---
 debian/changelog                        |  1 +
 debian/patches/fix_kptyprocesstest.diff | 56 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 79d8163..be17704 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ kde4libs (4:4.11.5-1) UNRELEASED; urgency=low
   * New patch: kstringhandlertest_fix.diff
   * New patch: disable_bogus_test.diff
   * Update symbols.
+  * New patch: fix_kptyprocesstest.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jan 2014 12:14:52 -0300
 
diff --git a/debian/patches/fix_kptyprocesstest.diff b/debian/patches/fix_kptyprocesstest.diff
new file mode 100644
index 0000000..9346b32
--- /dev/null
+++ b/debian/patches/fix_kptyprocesstest.diff
@@ -0,0 +1,56 @@
+Index: kde4libs/kpty/tests/kptyprocesstest.cpp
+===================================================================
+--- kde4libs.orig/kpty/tests/kptyprocesstest.cpp	2014-01-14 16:28:19.728840544 -0300
++++ kde4libs/kpty/tests/kptyprocesstest.cpp	2014-01-14 19:26:40.082679408 -0300
+@@ -88,31 +88,33 @@
+     }
+     QCOMPARE(p.pty()->readAll(), QByteArray("hello from me
"));
+ 
++    // echo closes stdout after echoing it's argument so this tests are bogus
+     // write to the second process' pty
+-    p2.pty()->write("hello from process 2
");
+-    QVERIFY(p2.pty()->waitForBytesWritten(1000));
++    //p2.pty()->write("hello from process 2
");
++    //QVERIFY(p2.pty()->waitForBytesWritten(1000));
++
+ 
+     // read the result back from the first process' pty
+-    QVERIFY(p.pty()->waitForReadyRead(1500));
+-    for (int i = 0; i < 5; ++i) {
+-        if (p.pty()->canReadLine())
+-            break;
+-        MyQThread::msleep(500);
+-    }
+-    QCOMPARE(p.pty()->readAll(), QByteArray("hello from process 2
"));
++    //QVERIFY(p.pty()->waitForReadyRead(1500));
++    //for (int i = 0; i < 5; ++i) {
++    //    if (p.pty()->canReadLine())
++    //        break;
++    //    MyQThread::msleep(500);
++    //}
++    //QCOMPARE(p.pty()->readAll(), QByteArray("hello from process 2
"));
+ 
+     // write to the first process' pty
+-    p.pty()->write("hi from process 1
");
+-    QVERIFY(p.pty()->waitForBytesWritten(1000));
++    //p.pty()->write("hi from process 1
");
++    //QVERIFY(p.pty()->waitForBytesWritten(1000));
+ 
+     // read the result back from the second process' pty
+-    QVERIFY(p2.pty()->waitForReadyRead(1500));
+-    for (int i = 0; i < 5; ++i) {
+-        if (p.pty()->canReadLine())
+-            break;
+-        MyQThread::msleep(500);
+-    }
+-    QCOMPARE(p2.pty()->readAll(), QByteArray("hi from process 1
"));
++    //QVERIFY(p2.pty()->waitForReadyRead(1500));
++    //for (int i = 0; i < 5; ++i) {
++    //    if (p.pty()->canReadLine())
++    //        break;
++    //    MyQThread::msleep(500);
++    //}
++    //QCOMPARE(p2.pty()->readAll(), QByteArray("hi from process 1
"));
+ 
+     // cleanup
+     p.terminate();
diff --git a/debian/patches/series b/debian/patches/series
index 44424b1..5f21eda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
 debian_standardsdirtest.diff
 kstringhandlertest_fix.diff
 disable_bogus_test.diff
+fix_kptyprocesstest.diff

-- 
KDE Development Platform Libraries module packaging