Merge policy and manual test.

Approved by Charles Kerr, PS Jenkins bot.

2 files changed, 28 insertions, 0 deletions

diff --git a/MERGE-REVIEW b/MERGE-REVIEW
new file mode 100644
index 0000000..da81ebd
--- /dev/null
+++ b/MERGE-REVIEW
@@ -0,0 +1,15 @@
+
+This documents the expections that the project has on what both submitters
+and reviewers should ensure that they've done for a merge into the project.
+
+== Submitter Responsibilities ==
+
+ * Ensure the project compiles and the test suite executes without error
+ * Ensure that non-obvious code has comments explaining it
+
+== Reviewer Responsibilities ==
+
+ * Did the Jenkins build compile?  Pass?  Run unit tests successfully?
+ * Are there appropriate tests to cover any new functionality?
+ * Run all the appropriate manual tests
+
diff --git a/tests/manual b/tests/manual
new file mode 100644
index 0000000..c05689f
--- /dev/null
+++ b/tests/manual
@@ -0,0 +1,13 @@
+Test-case unity-greeter-session-broadcast/application-on-greeter
+<dl>
+    <dt>NOTE: This test requires the separated greeter to land before it can be executed</dt>
+	<dt>Go to the home screen of the shell</dt>
+	<dt>Lock the screen of the device</dt>
+	<dt>Click the power button to cause the screen to turn on</dt>
+	    <dd>The screen should contain the lock screen</dd>
+	<dt>Slide on the left edge to reveal the launcher</dt>
+	    <dd>The launcher should appear with several apps on it</dd>
+	<dt>Select one of the apps on the launcher</dt>
+	    <dd>If there is a PIN set the dialog should be shown, enter the PIN</dd>
+		<dd>The session should open with the selected app in focus</dd>
+</dl>