Merge lp:~aacid/unity8/vjog_compiz_workaround into lp:unity8

[Albert Astals Cid]

Workaround compiz/unity7 behaviour change/bug

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, tests work again in compiz/unity7

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

[Michael Zanetti (mzanetti)]

Looks good, passes on other display servers than compiz (namely KWin) too.

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes. ran tests as make test and make try to verify.

 * Did CI run pass? If not, please explain why.

Waiting...

review: Approve

[lp:~aacid/unity8/vjog_compiz_workaround]

759. By Albert Astals Cid on 2014-03-07

a comment on the new code

[Michael Zanetti (mzanetti)]

tests still passing. Comment and workaround in DDA looking good too.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:757
http://jenkins.qa.ubuntu.com/job/unity8-ci/2454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3750
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3338/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/979
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/979/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3757/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3340/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2454/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:759
http://jenkins.qa.ubuntu.com/job/unity8-ci/2457/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3753
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3341/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/982
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/982/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3760
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3760/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3343/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5713/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4582

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2457/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/plugins/DashViews/organicgridtest.cpp'
--- tests/plugins/DashViews/organicgridtest.cpp	2014-01-14 12:25:52 +0000
+++ tests/plugins/DashViews/organicgridtest.cpp	2014-03-07 10:49:48 +0000
@@ -134,11 +134,12 @@
         view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/organicgridtest.qml"));
 
         view->show();
+        QTest::qWaitForWindowExposed(view);
         view->resize(470, 400);
-        QTest::qWaitForWindowExposed(view);
 
         grid = dynamic_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));
         grid->setModel(model);
+        QTRY_COMPARE(grid->width(), 470.);
 
         checkInitialPositions();
     }

=== modified file 'tests/plugins/DashViews/verticaljournaltest.cpp'
--- tests/plugins/DashViews/verticaljournaltest.cpp	2014-01-17 10:08:23 +0000
+++ tests/plugins/DashViews/verticaljournaltest.cpp	2014-03-07 10:49:48 +0000
@@ -135,11 +135,12 @@
         view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));
 
         view->show();
-        view->resize(470, 400);
         QTest::qWaitForWindowExposed(view);
+        view->resize(470, 400);
 
         vj = dynamic_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));
         vj->setModel(model);
+        QTRY_COMPARE(vj->width(), 470.);
 
         checkInitialPositions();
     }

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2014-02-24 16:05:07 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2014-03-07 10:49:48 +0000
@@ -103,6 +103,14 @@
 {
     GestureTest::init();
 
+    // We shouldn't need the three lines below, but a compiz/unity7
+    // regression means we don't pass the test without them because
+    // the window doesn't have the proper size. Can be removed in the
+    // future if the regression is fixed and tests pass again
+    m_view->resize(m_view->rootObject()->width(), m_view->rootObject()->height());
+    QTRY_COMPARE(m_view->width(), (int)m_view->rootObject()->width());
+    QTRY_COMPARE(m_view->height(), (int)m_view->rootObject()->height());
+
     fakeTimeSource.reset(new FakeTimeSource);
     fakeTimer = new FakeTimer(fakeTimeSource);
 }