From acf668d7986967f7180fdb4565f77bb505a5abf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 30 Sep 2015 10:22:54 +0200 Subject: [PATCH 1/2] [autotests] Adjust TestScreenEdges::testFullScreenBlocking for changes We need to wait the reactivation time before getting a pushback again. --- autotests/test_screen_edges.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/autotests/test_screen_edges.cpp b/autotests/test_screen_edges.cpp index 039393728b..3b6b1c5270 100644 --- a/autotests/test_screen_edges.cpp +++ b/autotests/test_screen_edges.cpp @@ -688,6 +688,7 @@ void TestScreenEdges::testFullScreenBlocking() QCOMPARE(Cursor::pos(), QPoint(1, 50)); // let's make the client fullscreen again, but with a geometry not intersecting the left edge + QTest::qWait(351); client.setFullScreen(true); client.setGeometry(client.geometry().translated(10, 0)); emit s->checkBlocking(); From 7365069ba0fafdc773d3b16dea80da2afca0781a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 30 Sep 2015 10:29:17 +0200 Subject: [PATCH 2/2] [autotests] Adjust TestScreenEdges::testCallback to changes We need to add more delay to get it trigger/pushback again. --- autotests/test_screen_edges.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autotests/test_screen_edges.cpp b/autotests/test_screen_edges.cpp index 3b6b1c5270..2e3a2f7d83 100644 --- a/autotests/test_screen_edges.cpp +++ b/autotests/test_screen_edges.cpp @@ -477,7 +477,7 @@ void TestScreenEdges::testCallback() QCOMPARE(Cursor::pos(), QPoint(1, 101)); // now let's try to trigger again - QTest::qWait(100); + QTest::qWait(351); setPos(QPoint(0, 100)); event.time = QDateTime::currentMSecsSinceEpoch(); QVERIFY(s->isEntered(&event)); @@ -507,6 +507,7 @@ void TestScreenEdges::testCallback() s->setConfig(config); s->reconfigure(); // it should trigger directly + QTest::qWait(350); event.time = QDateTime::currentMSecsSinceEpoch(); QVERIFY(s->isEntered(&event)); QCOMPARE(spy.count(), 3);