Merge lp:~lukas-kde/ubuntu-ui-toolkit/asyncDbusClipboard into lp:ubuntu-ui-toolkit/staging

[Lukáš Tinkl]

Unbreak the startup race between unity8/qtmir and UITK trying talk to content-hub

Unbreak the startup race between unity8/qtmir and UITK trying talk to content-hub

Do not initialize the UCContentHub class until the content hub service becomes available on DBUS; make the onPasteboardChanged() method async too, this is also blocking for ~25 seconds.

Fixes lp:1663106 - [regression] Logging in to Unity8 takes 25 seconds (the default DBus timeout)

[Cris Dywan (kalikiana)]

Notes from discussing this on IRC:

<ltinkl> unity8/qtmir is starting up, we have a TextField somewhere in our GUI which contains the call to UCContentHub, calls content-hub over DBUS, but at the same time content-hub is asking qtmir for authorization
I assume content-hub somehow also queries the clipboard, but the implementation of QPlatformClipboard is in qtmir :) so we get a nice circular dependency and DBUS gets stuck, until one of the calls times out
he tricky (blocking) part is creating QDBusInterface in your CTOR, you don't even have to make any calls
<kalikiana> How about making the mock service sleep when it initializes or responds?
Maybe the mock service should actually just time out the first call?

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1408/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7666/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1408/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/222/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7667/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/222/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1443/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7668/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1443/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1658/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7669/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1658/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/900/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1658/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1443/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1408/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/222/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7670/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7669
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7668
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7666
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7667

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/900/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

Changes looks good to me. Thx for working on that.

review: Approve

[lp:~lukas-kde/ubuntu-ui-toolkit/asyncDbusClipboard]

2171. By Lukáš Tinkl on 2017-02-10

if content-hub is already running, go and init directly

2172. By Lukáš Tinkl on 2017-02-10

fix the tests

do not wait needlessly, QTRY_COMPARE() already has a 5 second timeout

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1409/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7671/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1409/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1444/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7672/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1444/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1659/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7673/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1659/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/223/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7674/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/223/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/901/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1659
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1444
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1409
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/223
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7675/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7673
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7672
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7671
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7674

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/901/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Nice. Thanks for fixing the tests!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1410/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7676/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1410/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1445/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7677/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1445/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/224/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7678/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/224/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2172
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1660/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7679/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1660/rebuild

review: Approve (continuous-integration)

=== modified file 'src/UbuntuToolkit/privates/uccontenthub.cpp'
--- src/UbuntuToolkit/privates/uccontenthub.cpp	2017-01-26 14:29:30 +0000
+++ src/UbuntuToolkit/privates/uccontenthub.cpp	2017-02-10 18:15:36 +0000
@@ -21,8 +21,10 @@
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QMimeData>
 #include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
+#include <QtDBus/QDBusServiceWatcher>
 #include <QtQuick/QQuickItem>
 
 Q_LOGGING_CATEGORY(ucContentHub, "ubuntu.components.UCContentHub", QtMsgType::QtWarningMsg)
@@ -40,11 +42,17 @@
 UT_NAMESPACE_BEGIN
 
 UCContentHub::UCContentHub(QObject *parent)
-    : QObject(parent),
-      m_dbusIface(0),
-      m_contentHubIface(0),
-      m_canPaste(false),
-      m_targetItem(0)
+    : QObject(parent)
+{
+    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(contentHubService)) { // content hub already running
+        init();
+    } else {
+        m_watcher = new QDBusServiceWatcher(contentHubService, QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForRegistration, this);
+        connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &UCContentHub::init);
+    }
+}
+
+void UCContentHub::init()
 {
     m_dbusIface = new QDBusInterface(dbusService,
                                      dbusObjectPath,
@@ -76,24 +84,13 @@
             SLOT(onPasteboardChanged())
         );
 
-        m_canPaste = checkPasteFormats();
-    }
-}
-
-UCContentHub::~UCContentHub()
-{
-    if (m_dbusIface) {
-        delete m_dbusIface;
-    }
-
-    if (m_contentHubIface) {
-        delete m_contentHubIface;
+        onPasteboardChanged();
     }
 }
 
 void UCContentHub::requestPaste(QQuickItem *targetItem)
 {
-    if (!m_contentHubIface->isValid()) {
+    if (!m_contentHubIface || !m_contentHubIface->isValid()) {
         CONTENT_HUB_TRACE("Invalid Content Hub DBusInterface");
         return;
     }
@@ -106,12 +103,12 @@
     m_contentHubIface->call(QStringLiteral("RequestPasteByAppId"), appProfile);
 }
 
-bool UCContentHub::canPaste()
+bool UCContentHub::canPaste() const
 {
     return m_canPaste;
 }
 
-void UCContentHub::onPasteSelected(QString appId, QByteArray mimedata, bool pasteAsRichText)
+void UCContentHub::onPasteSelected(const QString &appId, const QByteArray &mimedata, bool pasteAsRichText)
 {
     if (getAppProfile() != appId) {
         return;
@@ -138,15 +135,39 @@
 
 void UCContentHub::onPasteboardChanged()
 {
-    if (checkPasteFormats() != m_canPaste) {
-        m_canPaste = !m_canPaste;
+    if (!m_contentHubIface || !m_contentHubIface->isValid()) {
+        CONTENT_HUB_TRACE("Invalid Content Hub DBusInterface");
+        return;
+    }
+
+    QDBusPendingCall pcall = m_contentHubIface->asyncCall(QStringLiteral("PasteFormats"));
+    QDBusPendingCallWatcher * watcher = new QDBusPendingCallWatcher(pcall, this);
+    connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher * call) {
+        QDBusPendingReply<QStringList> reply = *call;
+        call->deleteLater();
+        if (reply.isValid()) {
+            // TODO: ContentHub clipboard keeps a list of all available paste formats.
+            // Probably apps could make use of this information to check if a specific
+            // data type is available, instead of only checking if list is empty or not.
+            // (LP: #1657111)
+            setCanPaste(!reply.value().isEmpty());
+        } else {
+            CONTENT_HUB_TRACE("Invalid return from DBus call PasteFormats");
+        }
+    });
+}
+
+void UCContentHub::setCanPaste(bool value)
+{
+    if (value != m_canPaste) {
+        m_canPaste = value;
         Q_EMIT canPasteChanged();
     }
 }
 
-QString UCContentHub::getAppProfile()
+QString UCContentHub::getAppProfile() const
 {
-    if (!m_dbusIface->isValid()) {
+    if (!m_dbusIface || !m_dbusIface->isValid()) {
         CONTENT_HUB_TRACE("Invalid DBus DBusInterface");
         return QString();
     }
@@ -194,25 +215,4 @@
     return mimeData;
 }
 
-bool UCContentHub::checkPasteFormats()
-{
-    if (!m_contentHubIface->isValid()) {
-        CONTENT_HUB_TRACE("Invalid Content Hub DBusInterface");
-        return false;
-    }
-
-    QDBusReply<QStringList> reply = m_contentHubIface->call(QStringLiteral("PasteFormats"));
-    if (reply.isValid()) {
-        // TODO: ContentHub clipboard keeps a list of all available paste formats.
-        // Probably apps could make use of this information to check if a specific
-        // data type is available, instead of only checking if list is empty or not.
-        // (LP: #1657111)
-        return !reply.value().isEmpty();
-    } else {
-        CONTENT_HUB_TRACE("Invalid return from DBus call PasteFormats");
-    }
-
-    return false;
-}
-
 UT_NAMESPACE_END

=== modified file 'src/UbuntuToolkit/privates/uccontenthub_p.h'
--- src/UbuntuToolkit/privates/uccontenthub_p.h	2017-01-17 19:30:01 +0000
+++ src/UbuntuToolkit/privates/uccontenthub_p.h	2017-02-10 18:15:36 +0000
@@ -25,6 +25,7 @@
 
 class QMimeData;
 class QDBusInterface;
+class QDBusServiceWatcher;
 class QQuickItem;
 
 UT_NAMESPACE_BEGIN
@@ -32,35 +33,37 @@
 class UBUNTUTOOLKIT_EXPORT UCContentHub : public QObject
 {
     Q_OBJECT
-
+    friend class tst_UCContentHub;
     Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged)
 
 public:
-    UCContentHub(QObject* parent = 0);
-    ~UCContentHub();
+    UCContentHub(QObject* parent = nullptr);
+    ~UCContentHub() = default;
 
     Q_INVOKABLE void requestPaste(QQuickItem *targetItem);
 
-    bool canPaste();
-    QString getAppProfile();
+    bool canPaste() const;
+    QString getAppProfile() const;
     QMimeData* deserializeMimeData(const QByteArray &serializedMimeData);
 
 Q_SIGNALS:
     void pasteSelected(QQuickItem *targetItem, const QString &data);
     void canPasteChanged();
 
-public Q_SLOTS:
-    void onPasteSelected(QString appId, QByteArray mimedata, bool pasteAsRichText);
+private Q_SLOTS:
+    void init();
+    void onPasteSelected(const QString &appId, const QByteArray &mimedata, bool pasteAsRichText);
     void onPasteboardChanged();
 
 private:
-    bool checkPasteFormats();
-
-    QDBusInterface *m_dbusIface;
-    QDBusInterface *m_contentHubIface;
-
-    bool m_canPaste;
-    QQuickItem *m_targetItem;
+    void setCanPaste(bool value);
+    QDBusInterface *m_dbusIface{nullptr};
+    QDBusInterface *m_contentHubIface{nullptr};
+
+    bool m_canPaste{false};
+    QQuickItem *m_targetItem{nullptr};
+
+    QDBusServiceWatcher * m_watcher{nullptr};
 };
 
 UT_NAMESPACE_END

=== modified file 'tests/unit/contenthub/tst_contenthub.cpp'
--- tests/unit/contenthub/tst_contenthub.cpp	2017-01-26 16:02:48 +0000
+++ tests/unit/contenthub/tst_contenthub.cpp	2017-02-10 18:15:36 +0000
@@ -68,12 +68,10 @@
     tst_UCContentHub() {}
 
 private:
-    MockContentService *mockService;
-    UCContentHub *contentHub;
-    QSignalSpy *pasteRequestedSpy;
-    QSignalSpy *pasteSelectedSpy;
-
-    const int testTimeout = 5000;
+    MockContentService *mockService{nullptr};
+    UCContentHub *contentHub{nullptr};
+    QSignalSpy *pasteRequestedSpy{nullptr};
+    QSignalSpy *pasteSelectedSpy{nullptr};
 
     const QString dummyAppId = "DummyAppId";
 
@@ -143,11 +141,11 @@
         QDBusConnection connection = QDBusConnection::sessionBus();
         connection.registerObject("/", mockService);
         connection.registerService("com.ubuntu.content.dbus.Service");
-        pasteRequestedSpy = new QSignalSpy(mockService, SIGNAL(PasteRequested()));
+        pasteRequestedSpy = new QSignalSpy(mockService, &MockContentService::PasteRequested);
 
         qRegisterMetaType<QQuickItem*>();
         contentHub = new UCContentHub();
-        pasteSelectedSpy = new QSignalSpy(contentHub, SIGNAL(pasteSelected(QQuickItem*, const QString&)));
+        pasteSelectedSpy = new QSignalSpy(contentHub, &UCContentHub::pasteSelected);
     }
 
     void cleanupTestCase()
@@ -155,6 +153,7 @@
         delete pasteRequestedSpy;
         delete pasteSelectedSpy;
         delete contentHub;
+        delete mockService;
     }
 
     void cleanup()
@@ -187,8 +186,7 @@
         QMimeData textPaste;
         textPaste.setText(sampleHtml);
         contentHub->onPasteSelected(contentHub->getAppProfile(), serializeMimeData(textPaste), false);
-        pasteSelectedSpy->wait(testTimeout);
-        QCOMPARE(pasteSelectedSpy->count(), 1);
+        QTRY_COMPARE(pasteSelectedSpy->count(), 1);
         QList<QVariant> args = pasteSelectedSpy->takeFirst();
         QVERIFY(args.at(1).toString() == textPaste.text());
     }
@@ -198,8 +196,7 @@
         QMimeData htmlPaste;
         htmlPaste.setHtml(sampleHtml);
         contentHub->onPasteSelected(contentHub->getAppProfile(), serializeMimeData(htmlPaste), false);
-        pasteSelectedSpy->wait(testTimeout);
-        QCOMPARE(pasteSelectedSpy->count(), 1);
+        QTRY_COMPARE(pasteSelectedSpy->count(), 1);
         QList<QVariant> args = pasteSelectedSpy->takeFirst();
         QVERIFY(args.at(1).toString() == htmlPaste.text());
     }
@@ -209,8 +206,7 @@
         QMimeData htmlPaste;
         htmlPaste.setHtml(sampleHtml);
         contentHub->onPasteSelected(contentHub->getAppProfile(), serializeMimeData(htmlPaste), true);
-        pasteSelectedSpy->wait(testTimeout);
-        QCOMPARE(pasteSelectedSpy->count(), 1);
+        QTRY_COMPARE(pasteSelectedSpy->count(), 1);
         QList<QVariant> args = pasteSelectedSpy->takeFirst();
         QVERIFY(args.at(1).toString() == htmlPaste.html());
     }
@@ -220,8 +216,7 @@
         QMimeData textPaste;
         textPaste.setText(sampleText);
         contentHub->onPasteSelected(dummyAppId, serializeMimeData(textPaste), false);
-        pasteSelectedSpy->wait(testTimeout);
-        QCOMPARE(pasteSelectedSpy->count(), 0);
+        QTRY_COMPARE(pasteSelectedSpy->count(), 0);
     }
 
     void test_KeyboardShortcutOnTextField()
@@ -230,10 +225,10 @@
         testCase->rootObject()->forceActiveFocus();
         QQuickItem *textField = testCase->findItem<QQuickItem*>("textField");
         QTest::keyClick(textField->window(), Qt::Key_Tab);
-        QTRY_COMPARE_WITH_TIMEOUT(textField->property("activeFocus").toBool(), true, testTimeout);
+        QTRY_COMPARE(textField->property("activeFocus").toBool(), true);
+        QTRY_COMPARE(contentHub->canPaste(), true);
         QTest::keyClick(textField->window(), Qt::Key_V, Qt::ControlModifier|Qt::ShiftModifier);
-        pasteRequestedSpy->wait(testTimeout);
-        QCOMPARE(pasteRequestedSpy->count(), 1);
+        QTRY_COMPARE(pasteRequestedSpy->count(), 1);
     }
     
     void test_KeyboardShortcutOnTextArea()
@@ -242,10 +237,10 @@
         testCase->rootObject()->forceActiveFocus();
         QQuickItem *textArea = testCase->findItem<QQuickItem*>("textArea");
         QTest::keyClick(textArea->window(), Qt::Key_Tab);
-        QTRY_COMPARE_WITH_TIMEOUT(textArea->property("activeFocus").toBool(), true, testTimeout);
+        QTRY_COMPARE(textArea->property("activeFocus").toBool(), true);
+        QTRY_COMPARE(contentHub->canPaste(), true);
         QTest::keyClick(textArea->window(), Qt::Key_V, Qt::ControlModifier|Qt::ShiftModifier);
-        pasteRequestedSpy->wait(testTimeout);
-        QCOMPARE(pasteRequestedSpy->count(), 1);
+        QTRY_COMPARE(pasteRequestedSpy->count(), 1);
     }
 };