Merge lp:~ted/unity-greeter-session-broadcast/merge-policy into lp:unity-greeter-session-broadcast/14.04

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 30
Merged at revision: 29
Proposed branch: lp:~ted/unity-greeter-session-broadcast/merge-policy
Merge into: lp:unity-greeter-session-broadcast/14.04
Diff against target: 38 lines (+28/-0)
2 files modified
MERGE-REVIEW (+15/-0)
tests/manual (+13/-0)
To merge this branch: bzr merge lp:~ted/unity-greeter-session-broadcast/merge-policy
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+204820@code.launchpad.net

Commit message

Merge policy and manual test

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'MERGE-REVIEW'
--- MERGE-REVIEW 1970-01-01 00:00:00 +0000
+++ MERGE-REVIEW 2014-02-05 05:22:16 +0000
@@ -0,0 +1,15 @@
1
2This documents the expections that the project has on what both submitters
3and reviewers should ensure that they've done for a merge into the project.
4
5== Submitter Responsibilities ==
6
7 * Ensure the project compiles and the test suite executes without error
8 * Ensure that non-obvious code has comments explaining it
9
10== Reviewer Responsibilities ==
11
12 * Did the Jenkins build compile? Pass? Run unit tests successfully?
13 * Are there appropriate tests to cover any new functionality?
14 * Run all the appropriate manual tests
15
016
=== added directory 'tests'
=== added file 'tests/manual'
--- tests/manual 1970-01-01 00:00:00 +0000
+++ tests/manual 2014-02-05 05:22:16 +0000
@@ -0,0 +1,13 @@
1Test-case unity-greeter-session-broadcast/application-on-greeter
2<dl>
3 <dt>NOTE: This test requires the separated greeter to land before it can be executed</dt>
4 <dt>Go to the home screen of the shell</dt>
5 <dt>Lock the screen of the device</dt>
6 <dt>Click the power button to cause the screen to turn on</dt>
7 <dd>The screen should contain the lock screen</dd>
8 <dt>Slide on the left edge to reveal the launcher</dt>
9 <dd>The launcher should appear with several apps on it</dd>
10 <dt>Select one of the apps on the launcher</dt>
11 <dd>If there is a PIN set the dialog should be shown, enter the PIN</dd>
12 <dd>The session should open with the selected app in focus</dd>
13</dl>

Subscribers

People subscribed via source and target branches