Unity 8

Merge lp:~josharenson/unity8/greeter_mode into lp:unity8

greeter_mode
Merge into trunk

Proposed by Josh Arenson on 2015-04-15

Status:	Merged
Approved by:	Michael Zanetti on 2015-06-16
Approved revision:	1719
Merged at revision:	1818
Proposed branch:	lp:~josharenson/unity8/greeter_mode
Merge into:	lp:unity8
Diff against target:	262 lines (+150/-43) 6 files modified qml/Greeter/ShimGreeter.qml (+45/-0) qml/Shell.qml (+56/-43) qml/Stages/ShimStage.qml (+44/-0) tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-0) tests/qmltests/tst_Shell.qml (+2/-0) tests/qmltests/tst_ShellWithPin.qml (+2/-0)
To merge this branch:	bzr merge lp:~josharenson/unity8/greeter_mode
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Abstain on 2015-06-16
Albert Astals Cid (community)			Approve on 2015-05-18
Daniel d'Andrada (community)			Abstain on 2015-04-27
Michael Terry		2015-04-15	Approve on 2015-04-24
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-24
Review via email: mp+256385@code.launchpad.net

Commit Message

Implement bare-bones shellMode=greeter and shellMode=shell

For shellMode=greeter, the shell loads a shim stage and uses the integrated greeter
For shellMode=shell, the shell loads without a greeter. A shim greeter is loaded to satisfy the dependencies the shell has on the greeter.

Description of the Change

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

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

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

Implement bare-bones shellMode=greeter and shellMode=shell

PS Jenkins bot (ps-jenkins) wrote on 2015-04-16:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-04-16:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-04-17:

FAILED: Continuous integration, rev:1709
http://jenkins.qa.ubuntu.com/job/unity8-ci/5565/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2301/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/730
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2020/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2299
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19732

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-04-17:

FAILED: Continuous integration, rev:1709
http://jenkins.qa.ubuntu.com/job/unity8-ci/5571/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2325/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/736
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2040/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2323
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19769

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-04-21:

Inline code review comments, will test on device shortly.

PS Jenkins bot (ps-jenkins) wrote on 2015-04-22:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) on 2015-04-22:

Michael Terry (mterry) wrote on 2015-04-22:

Just to be on the same page, the ShimStage is a temporary thing, right? In the next phases, "greeter" will have a transparent background, letting you see the session behind it (in the no-password case).

I left a comment about indentation (line 123 of the diff).

Also, unity8.greeter.tests.test_args.GreeterArgsTest.test_shell_mode failed with:

autopilot.exceptions.StateNotFoundError: Object not found with name '*' and properties {'objectName': 'greeter'}.

And these other failures could be relevant? (I dunno, they say "greeter"):
unity8.application_lifecycle.tests.test_application_lifecycle.ApplicationLifecycleTests.test_greeter_hides_on_app_open
unity8.shell.tests.test_notifications.InteractiveNotificationBase.test_modal_sd_without_greeter(Native Device)

Michael Terry (mterry) wrote on 2015-04-22:

Works fine on the device!

PS Jenkins bot (ps-jenkins) wrote on 2015-04-22:

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

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2015-04-22:

> Just to be on the same page, the ShimStage is a temporary thing, right? In
> the next phases, "greeter" will have a transparent background, letting you see
> the session behind it (in the no-password case).
>
> I left a comment about indentation (line 123 of the diff).
>
> Also, unity8.greeter.tests.test_args.GreeterArgsTest.test_shell_mode failed
> with:
>
> autopilot.exceptions.StateNotFoundError: Object not found with name '*' and
> properties {'objectName': 'greeter'}.
>
> And these other failures could be relevant? (I dunno, they say "greeter"):
> unity8.application_lifecycle.tests.test_application_lifecycle.ApplicationLifec
> ycleTests.test_greeter_hides_on_app_open
> unity8.shell.tests.test_notifications.InteractiveNotificationBase.test_modal_s
> d_without_greeter(Native Device)

Should be ok now, but I want to see how CI handles it.

PS Jenkins bot (ps-jenkins) wrote on 2015-04-23:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-04-23:

We talked about this on IRC, but just so it doesn't get lost. This CI run looks good, but introduces a new test failure (that isn't covered by the three known ones in bug 1446846):

unity8.shell.tests.test_notifications.InteractiveNotificationBase.test_modal_sd_without_greeter(Nexus 4)

Josh Arenson (josharenson) wrote on 2015-04-23:

> We talked about this on IRC, but just so it doesn't get lost. This CI run
> looks good, but introduces a new test failure (that isn't covered by the three
> known ones in bug 1446846):
>
> unity8.shell.tests.test_notifications.InteractiveNotificationBase.test_modal_s
> d_without_greeter(Nexus 4)

unity8.shell.tests.test_notifications.InteractiveNotificationBase.test_modal_sd_without_greeter fails on Arale with trunk. Seems unrelated to me.

Michał Sawicz (saviq) wrote on 2015-04-23:

I tried to reproduce on my mako, and this test passed just fine. I've retriggered the CI job to see if this persists.

PS Jenkins bot (ps-jenkins) wrote on 2015-04-24:

FAILED: Continuous integration, rev:1718
http://jenkins.qa.ubuntu.com/job/unity8-ci/5609/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2424/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/774
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2109/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2422
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2422/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19885

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

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2015-04-24:

> I tried to reproduce on my mako, and this test passed just fine. I've
> retriggered the CI job to see if this persists.

As stated on IRC this morning, it also works fine on desktop.

PS Jenkins bot (ps-jenkins) wrote on 2015-04-24:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) on 2015-04-24:

review: Approve

Daniel d'Andrada (dandrader) wrote on 2015-04-24:

When I run "make tryShell" I get this warning:
qml/Shell.qml:83: ReferenceError: shellMode is not defined

Could you please fix this in this MP as well?

Daniel d'Andrada (dandrader) wrote on 2015-04-27:

> When I run "make tryShell" I get this warning:
> qml/Shell.qml:83: ReferenceError: shellMode is not defined
>
> Could you please fix this in this MP as well?

For the record. This MP solves it.

review: Abstain

Albert Astals Cid (aacid) wrote on 2015-05-11:

You have bad tags, clean them up

lp:~josharenson/unity8/greeter_mode: would delete 8.01.1+15.04.20141112.1~rtm-0ubuntu1,8.02+15.04.20150217~rtm-0ubuntu1,8.01.1+15.04.20141111~rtm-0ubuntu1,8.01.1+14.10.20141105.2~rtm-0ubuntu1,8.02+15.04.20150113~rtm-0ubuntu1,8.02+15.04.20141218~rtm-0ubuntu1,8.02+15.04.20150122.2~rtm-0ubuntu1,8.02+15.04.20150406~rtm-0ubuntu1,8.02+15.04.20141216~rtm-0ubuntu1,8.01.1+15.04.20141208~rtm-0ubuntu1,8.00+14.10.20141015.4~rtm-0ubuntu1,8.02+15.04.20150226~rtm-0ubuntu1,8.02+15.04.20150107~rtm-0ubuntu1,8.02+15.04.20150120~rtm-0ubuntu1,8.00+14.10.20141017-0ubuntu1

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2015-05-18:

Tags are gone \o/

review: Approve

Michael Zanetti (mzanetti) wrote on 2015-06-15:

Needs a merge with trunk

review: Needs Fixing

lp:~josharenson/unity8/greeter_mode updated on 2015-06-16

1719. By Josh Arenson on 2015-06-15: * No-change rebuild against Qt 5.4.2.
[ Michał Sawicz ]
* Implement full-shell rotation (LP: #1210199)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Implemented autopilot-test and fake-sensors for shell-rotation.
[ Mirco Müller ]
* Implemented autopilot-test and fake-sensors for shell-rotation.
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Renato Araujo Oliveira Filho ]
* Set the device led color to green. (LP: #1450894)
[ Albert Astals Cid ]
* Add overrides to override functions
* Implement "rating-edit" preview widget (LP: #1318144)
* Make the DashContent::test_mainNavigation test more stable (LP:
  #1450809)
* Use art height as implicitHeight when the header is overlayed and
  there's no summary
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Introducing FloatingFlickable
* Make Ubuntu.Gestures components install TouchRegistry by themselves
[ Michael Terry ]
* Fix a possible crash in our PAM threading code. (LP: #1425362) (LP:
  #1425362)
* Fix the lockscreen becoming unresponsive after testing an app on the
  device from QtCreator. (LP: #1435364)
[ Nick Dedekind ]
* Fixed desktop stage app focus.
* Fixed issue in laggy indicator autpilot tests (LP: #1446846)
[ Albert Astals Cid ]
* Workarounds for concierge mode.
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Albert Astals Cid ]
* Make runtests fake a test error if make fails
* Make the test more stable
* Use dbus-test-runner instead of dbus-launch
[ Daniel d'Andrada ]
* DirectionalDragArea: improvements & API grooming (LP: #1417920)
* Fix EdgeDragEvaluator when a drag can happen both ways
  (Direction.Horizontal)
[ Josh Arenson ]
* Remove panelHeight property as it is unused.
[ Leo Arias ]
* Initial clean up of the autopilot tests set up. Removed the touch
  device from the test case. Moved the restart of unity to a fixture.
  Removed the unused DragMixin. Updated the setUpClass to use
  process_helpers. Removed the workaround for bug #1238417, already
  fixed. Use the toolkit helper to set the testability environment
  variable. Fixed the indicators base class that was restarting unity
  twice. (LP: #1238417, #1447206)
* Use the base class from the toolkit in autopilot tests.
[ Michael Zanetti ]
* emit application-stop when we're going down (LP: #1326513)
[ Michał Sawicz ]
* UNITY_SCOPES_LIST is no more
[ handsome_feng<email address hidden> ]
* When click the favorite scope in Dash Manager , it just return to
  the corresponding scope page. (LP: #1447056)
[ Albert Astals Cid ]
* Compile with Qt 5.5 (LP: #1437238)
* Different way of top aligning labels when the other one in the row
  is multiline (LP: #1442085)
* make pot_file
[ Andrea Cimitan ]
* Set sourceSize for DashBackground.qml Image
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk. added: po/sk.po
[ Daniel d'Andrada ]
* Move handling of command line options to a separate class
* Refactor tst_PhysicalKeysMapper.qml
[ Leo Arias ]
* For autopilot tests, use the device simulation scenarios from the
  toolkit.
[ Leonardo Arias Fonseca ]
* For autopilot tests, use the device simulation scenarios from the
  toolkit.
[ Michael Zanetti ]
* Make sure dnd mode is ended properly when drag gesture is cancelled
  (LP: #1444949)
[ Michał Sawicz ]
* Fix flake8 warnings (LP: #1444170)
* Move mock indicator service to unity8-fake-env, as it's a binary-
  dependent package.
[ Nick Dedekind ]
* Use asynchronous dbus requests for property updates. (LP: #1436982)

Michael Zanetti (mzanetti) on 2015-06-16:

review: Abstain

Sebastien Bacher (seb128) wrote on 2015-06-29:

looks like those change regressed the desktop which is loading the phone greeter now, see bug #1469761

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Josh Arenson

Mohammad Rakibul Hasan

Unity Team

 === added file 'qml/Greeter/ShimGreeter.qml'
 --- qml/Greeter/ShimGreeter.qml	1970-01-01 00:00:00 +0000
 +++ qml/Greeter/ShimGreeter.qml	2015-06-16 02:23:55 +0000
@@ -0,0 +1,45 @@
++/*
++ * Copyright (C)  2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.3
++
++/*
++ * This is a shim greeter that is only used to provide a shell,
++ * running without a greeter, the requisite information
++ *
++ */
++
++/* FIXME: this shuld be fine as a QtObject, but bug lp:1447391
++ * dictates wrapping as an item instead
++ */
++Item {
++    id: shimGreeter
++
++    readonly property bool active: false
++    readonly property bool hasLockedApp: lockedApp !== ""
++    readonly property bool locked: false
++    readonly property bool shown: false
++    readonly property bool waiting: false
++
++    property string lockedApp: ""
++
++    // Since ShimGreeter is never active, these can just return
++    property var forceShow: (function() { return; })
++    property var notifyAboutToFocusApp: (function(appId) { return; })
++    property var notifyAppFocused: (function(appId) { return; })
++    property var notifyShowingDashFromDrag: (function(appId) { return false; })
++
++}
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2015-06-12 16:07:43 +0000
 +++ qml/Shell.qml	2015-06-16 02:23:55 +0000
@@ -111,6 +111,8 @@
      // This is _only_ used to expose the property to autopilot tests
      readonly property string testShellMode: shellMode
++    readonly property alias greeter: greeterLoader.item
++
      function activateApplication(appId) {
          if (ApplicationManager.findApplication(appId)) {
              ApplicationManager.requestFocusApplication(appId);
@@ -262,7 +264,9 @@
                                             ? "phone"
                                             : shell.usageScenario
              source: {
--                if (applicationsDisplayLoader.usageScenario === "phone") {
++                if(shellMode === "greeter") {
++                    return "Stages/ShimStage.qml"
++                } else if (applicationsDisplayLoader.usageScenario === "phone") {
                      return "Stages/PhoneStage.qml";
                  } else if (applicationsDisplayLoader.usageScenario === "tablet") {
                      return "Stages/TabletStage.qml";
@@ -414,50 +418,59 @@
+         }
+     }
--    Greeter {
--        id: greeter
--        objectName: "greeter"
--
--        hides: [launcher, panel.indicators]
--        tabletMode: shell.usageScenario !== "phone"
--        launcherOffset: launcher.progress
--        forcedUnlock: tutorial.running
--        background: shell.background
--
++    Loader {
++        id: greeterLoader
          anchors.fill: parent
          anchors.topMargin: panel.panelHeight
--
--        // avoid overlapping with Launcher's edge drag area
--        // FIXME: Fix TouchRegistry & friends and remove this workaround
--        //        Issue involves launcher's DDA getting disabled on a long
--        //        left-edge drag
--        dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
--
--        onSessionStarted: {
--            launcher.hide();
--        }
--
--        onTease: {
--            if (!tutorial.running) {
--                launcher.tease();
--            }
--        }
--
--        onEmergencyCall: startLockedApp("dialer-app")
--
--        Timer {
--            // See powerConnection for why this is useful
--            id: showGreeterDelayed
--            interval: 1
--            onTriggered: {
--                greeter.forceShow();
--            }
--        }
--
--        Binding {
--            target: ApplicationManager
--            property: "suspended"
--            value: greeter.shown
++        sourceComponent: shellMode != "shell" ? integratedGreeter :
++            Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));
++        onLoaded: {
++                item.objectName = "greeter"
++        }
++    }
++
++    Component {
++        id: integratedGreeter
++        Greeter {
++
++            hides: [launcher, panel.indicators]
++            tabletMode: shell.sideStageEnabled
++            launcherOffset: launcher.progress
++            forcedUnlock: tutorial.running
++            background: shell.background
++
++            // avoid overlapping with Launcher's edge drag area
++            // FIXME: Fix TouchRegistry & friends and remove this workaround
++            //        Issue involves launcher's DDA getting disabled on a long
++            //        left-edge drag
++            dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
++
++            onSessionStarted: {
++                launcher.hide();
++            }
++
++            onTease: {
++                if (!tutorial.running) {
++                    launcher.tease();
++                }
++            }
++
++            onEmergencyCall: startLockedApp("dialer-app")
++
++            Binding {
++                target: ApplicationManager
++                property: "suspended"
++                value: greeter.shown
++            }
++        }
++    }
++
++    Timer {
++        // See powerConnection for why this is useful
++        id: showGreeterDelayed
++        interval: 1
++        onTriggered: {
++            greeter.forceShow();
+         }
+     }
 === added file 'qml/Stages/ShimStage.qml'
 --- qml/Stages/ShimStage.qml	1970-01-01 00:00:00 +0000
 +++ qml/Stages/ShimStage.qml	2015-06-16 02:23:55 +0000
@@ -0,0 +1,44 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.3
++import Ubuntu.Components 0.1
++
++Rectangle {
++    id: shimStage
++
++    anchors.fill: parent
++    color: UbuntuColors.lightAubergine
++
++    Text {
++        id: greeterModeText
++
++        anchors.horizontalCenter: parent.horizontalCenter
++        anchors.top: parent.top
++        anchors.topMargin: units.gu(10)
++        font.bold: true
++        horizontalAlignment: Text.AlignHCenter
++        text: "Shell is in \"greeter\" mode"
++    }
++
++    Text {
++        anchors.centerIn: parent
++        color: UbuntuColors.orange
++        font.pointSize: units.gu(8)
++        horizontalAlignment: Text.AlignHCenter
++        text: "Shim \nStage"
++    }
++}
 === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-05-18 23:04:12 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-06-16 02:23:55 +0000
@@ -73,6 +73,7 @@
              sourceComponent: Component {
                  Shell {
                      property string indicatorProfile: "phone"
++                    property string shellMode: "full-greeter" /* default */
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true;
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-06-12 16:07:43 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-06-16 02:23:55 +0000
@@ -81,6 +81,8 @@
              property bool itemDestroyed: false
              sourceComponent: Component {
                  Shell {
++                    property string shellMode: "full-greeter" /* default */
++
                      usageScenario: "phone"
                      orientation: Qt.PortraitOrientation
                      primaryOrientation: Qt.PortraitOrientation
 === modified file 'tests/qmltests/tst_ShellWithPin.qml'
 --- tests/qmltests/tst_ShellWithPin.qml	2015-05-11 14:36:03 +0000
 +++ tests/qmltests/tst_ShellWithPin.qml	2015-06-16 02:23:55 +0000
@@ -69,6 +69,8 @@
              property bool itemDestroyed: false
              sourceComponent: Component {
                  Shell {
++                    property string shellMode: "full-greeter" /* default */
++
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true
+                     }