Merge lp:~zsombi/ubuntu-ui-toolkit/dynamic-tabs-test-failure into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fix for arm64 test failure

[Tim Peeters (tpeeters)]

ok

review: Approve

[lp:~zsombi/ubuntu-ui-toolkit/dynamic-tabs-test-failure]

1010. By Zsombor Egri on 2014-04-15

bug ID added to the comments

1011. By Zsombor Egri on 2014-04-15

comments fixed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1010
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4422
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4422/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6045
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4983
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4983/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/26/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-04-10 11:25:17 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-15 14:53:59 +0000
@@ -473,8 +473,6 @@
                 var tab = tabsList[i];
                 if (internal.isTab(tab)) {
                     tabIndex = i - offset;
-                    // make sure we have the right parent
-                    tab.parent = tabs;
 
                     if (!tab.__protected.inserted) {
                         tab.__protected.index = tabIndex;
@@ -511,7 +509,17 @@
 
             for (var i = start; i < count; i++) {
                 var tab = get(i).tab;
-                tab.__protected.index = i;
+                // FIXME: introduce an idle timer to get the model updated properly. This small delay
+                // is needed for arm64 unit tests, as the move() seems to update the model asynchronously.
+                // fixes bug #1308086
+                if (!tab) wait(0);
+                tab = get(i).tab;
+
+                if (tab) {
+                    tab.__protected.index = i;
+                } else {
+                    console.error("Invalid Tab at index", i, get(i).title)
+                }
             }
         }
 

=== modified file 'tests/unit_x11/tst_components/tst_tabs.qml'
--- tests/unit_x11/tst_components/tst_tabs.qml	2014-02-25 11:01:06 +0000
+++ tests/unit_x11/tst_components/tst_tabs.qml	2014-04-15 14:53:59 +0000
@@ -90,7 +90,7 @@
                 title: "load"
                 page: Loader {
                     id: loader
-                    sourceComponent: tabs.selectedTabIndex != 5 ? null : pageComponent
+                    sourceComponent: tabs.selectedTabIndex != tabFlickLoader.index ? null : pageComponent
                 }
             }
             Tab {
@@ -103,8 +103,8 @@
                         right: parent.right
                         bottom: parent.bottom
                     }
-                    // height compes from the loaded Page
-                    sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null
+                    // height comes from the loaded Page
+                    sourceComponent: tabs.selectedTabIndex === tabNoFlickLoader.index ? pageComponentNoFlick : null
                 }
             }
         }
@@ -219,6 +219,11 @@
         name: "TabsAPI"
         when: windowShown
 
+        function init() {
+            // introduce a small delay in front of each test
+            wait(200);
+        }
+
         /*
           The following testcases are all related to bug #1253804
           */