[Pkg-owncloud-commits] [owncloud-client] 01/03: Backport a patch to pass all tests

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit e2575267533e95cd968bf9d09f2765a98849a00d
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Aug 8 14:06:02 2015 +0200

    Backport a patch to pass all tests
---
 ...anschecksumvalidator-Do-not-use-arbitrary.patch | 100 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 101 insertions(+)

diff --git a/debian/patches/0008-Test-for-transchecksumvalidator-Do-not-use-arbitrary.patch b/debian/patches/0008-Test-for-transchecksumvalidator-Do-not-use-arbitrary.patch
new file mode 100644
index 0000000..26623d1
--- /dev/null
+++ b/debian/patches/0008-Test-for-transchecksumvalidator-Do-not-use-arbitrary.patch
@@ -0,0 +1,100 @@
+From: Olivier Goffart <ogoffart at woboq.com>
+Date: Thu, 25 Jun 2015 12:45:09 +0200
+Subject: Test for transchecksumvalidator: Do not use arbitrary waiting time
+
+Just stop the loop when we have the result.
+
+This will hopefully fix the jenkins build
+---
+ test/testtranschecksumvalidator.h | 35 ++++++++++++-----------------------
+ 1 file changed, 12 insertions(+), 23 deletions(-)
+
+diff --git a/test/testtranschecksumvalidator.h b/test/testtranschecksumvalidator.h
+index 5f0ac77..e97aa8f 100644
+--- a/test/testtranschecksumvalidator.h
++++ b/test/testtranschecksumvalidator.h
+@@ -27,17 +27,10 @@ using namespace OCC;
+         QString _root;
+         QString _testfile;
+         QString _expectedError;
+-        QEventLoop     _loop;
+         QByteArray     _expected;
+         bool           _successDown;
+         bool           _errorSeen;
+ 
+-    void processAndWait() {
+-            _loop.processEvents();
+-            Utility::usleep(200000);
+-            _loop.processEvents();
+-    }
+-
+     public slots:
+ 
+     void slotUpValidated(const QByteArray& checksum) {
+@@ -79,9 +72,10 @@ using namespace OCC;
+         qDebug() << "XX Expected Checksum: " << _expected;
+         vali->uploadValidation();
+ 
+-        usleep(5000);
++        QEventLoop loop;
++        connect(vali, SIGNAL(validated(QByteArray)), &loop, SLOT(quit()), Qt::QueuedConnection);
++        loop.exec();
+ 
+-        _loop.processEvents();
+         delete vali;
+     }
+ 
+@@ -95,9 +89,10 @@ using namespace OCC;
+         _expected.append(":"+FileSystem::calcMd5( _testfile ));
+         vali->uploadValidation();
+ 
+-        usleep(2000);
++        QEventLoop loop;
++        connect(vali, SIGNAL(validated(QByteArray)), &loop, SLOT(quit()), Qt::QueuedConnection);
++        loop.exec();
+ 
+-        _loop.processEvents();
+         delete vali;
+     }
+ 
+@@ -112,9 +107,10 @@ using namespace OCC;
+ 
+         vali->uploadValidation();
+ 
+-        usleep(2000);
++        QEventLoop loop;
++        connect(vali, SIGNAL(validated(QByteArray)), &loop, SLOT(quit()), Qt::QueuedConnection);
++        loop.exec();
+ 
+-        _loop.processEvents();
+         delete vali;
+     }
+ 
+@@ -131,24 +127,17 @@ using namespace OCC;
+         connect(vali, SIGNAL(validationFailed(QString)), this, SLOT(slotDownError(QString)));
+         vali->downloadValidation(adler);
+ 
+-        usleep(2000);
+-
+-        _loop.processEvents();
+-        QVERIFY(_successDown);
++        QTRY_VERIFY(_successDown);
+ 
+         _expectedError = QLatin1String("The downloaded file does not match the checksum, it will be resumed.");
+         _errorSeen = false;
+         vali->downloadValidation("Adler32:543345");
+-        usleep(2000);
+-        _loop.processEvents();
+-        QVERIFY(_errorSeen);
++        QTRY_VERIFY(_errorSeen);
+ 
+         _expectedError = QLatin1String("The checksum header is malformed.");
+         _errorSeen = false;
+         vali->downloadValidation("Klaas32:543345");
+-        usleep(2000);
+-        _loop.processEvents();
+-        QVERIFY(_errorSeen);
++        QTRY_VERIFY(_errorSeen);
+ 
+         delete vali;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index d005e72..540a69f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-remove_admin.patch
 0006-move-configfile.patch
 0007-move-translations.patch
+0008-Test-for-transchecksumvalidator-Do-not-use-arbitrary.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git