[SCM] qtwebsockets packaging branch, master, updated. debian/5.5.1-2-3-gee09b23

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebsockets.git;a=commitdiff;h=caa9ad7

The following commit has been merged in the master branch:
commit caa9ad72c4baa4d0dbefbc54814a590bdeb0d735
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 19 12:01:04 2015 +0300

    Use QTRY_COMPARE to make tst_QWebSocket::tst_errorString() less flaky.
---
 debian/changelog                  |  3 +++
 debian/patches/qtry_compare.patch | 17 +++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d62b2d6..ba8e72d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebsockets-opensource-src (5.5.1-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Use QTRY_COMPARE in a couple of places to make the tests less flaky
+    (qtry_compare.patch).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 Oct 2015 11:59:04 +0300
 
diff --git a/debian/patches/qtry_compare.patch b/debian/patches/qtry_compare.patch
new file mode 100644
index 0000000..7aeedbd
--- /dev/null
+++ b/debian/patches/qtry_compare.patch
@@ -0,0 +1,17 @@
+Description: use QTRY_COMPARE where needed to add 5-seconds timeout
+Origin: upstream, http://code.qt.io/cgit/qt/qtwebsockets.git/commit/?id=a5cb3b8ff10fcf1d
+Last-Update: 2015-10-19
+
+--- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
++++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
+@@ -573,9 +573,7 @@
+ 
+     socket.open(QUrl(QStringLiteral("ws://someserver.on.mars:9999")));
+ 
+-    if (errorSpy.count() == 0)
+-        errorSpy.wait(500);
+-    QCOMPARE(errorSpy.count(), 1);
++    QTRY_COMPARE(errorSpy.count(), 1);
+     QList<QVariant> arguments = errorSpy.takeFirst();
+     QAbstractSocket::SocketError socketError =
+             qvariant_cast<QAbstractSocket::SocketError>(arguments.at(0));
diff --git a/debian/patches/series b/debian/patches/series
index 02c4e42..6bbd82b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_qml_tests.patch
+qtry_compare.patch

-- 
qtwebsockets packaging