Merge lp:~nskaggs/ubuntu-clock-app/manual-tests-from-pilot into lp:ubuntu-clock-app

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 423
Merged at revision: 423
Proposed branch: lp:~nskaggs/ubuntu-clock-app/manual-tests-from-pilot
Merge into: lp:ubuntu-clock-app
Diff against target: 318 lines (+73/-45)
9 files modified
tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-alarms.pxu (+37/-30)
tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-setting.pxu (+10/-3)
tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-stopwatch.pxu (+9/-2)
tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-worldcity.pxu (+8/-1)
tests/manual/2014.com.ubuntu.clock:clock-tests/launcher/clock-test-cli (+5/-5)
tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-alarm.whitelist (+1/-1)
tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-setting.whitelist (+1/-1)
tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-stopwatch.whitelist (+1/-1)
tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-worldcity.whitelist (+1/-1)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-clock-app/manual-tests-from-pilot
Reviewer Review Type Date Requested Status
Bartosz Kosiorek Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+280779@code.launchpad.net

Commit message

Merge back the tweaks needed for Pilot to the manual tests

Description of the change

Merge back the tweaks needed for Pilot to the manual tests

Ugh, newline and whitespace changes, my apologies. We needed to add 'clock-' to the front of things and we added a resource plugin to the top. Since this runs on the desktop, the plugin should fail silently, but feel free to leave feedback on it's inclusion. This is simply a straight copy of what ran in Pilot. I'd like to sync them; apologies for taking so long.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

For me it looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-alarms.pxu' (properties changed: -x to +x)
--- tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu 2015-08-23 00:32:24 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-alarms.pxu 2015-12-16 22:30:29 +0000
@@ -1,6 +1,13 @@
1id: alarm/trigger-alarm1plugin: resource
2id: clock-alarm/system-image
3_summary: [Automated] gather system information
4command: system-image-cli -i
5_description:
6 Gather system info
7
8id: clock-alarm/trigger-alarm
2plugin: manual9plugin: manual
3_summary: Trigger alarm test 10_summary: Trigger alarm test
4estimated_duration: 12011estimated_duration: 120
5_description:12_description:
6 This test checks if an alarm is triggered at the correct time by the datetime indicator.13 This test checks if an alarm is triggered at the correct time by the datetime indicator.
@@ -13,14 +20,14 @@
13 minute. Do not change any other options. Save Alarm.20 minute. Do not change any other options. Save Alarm.
14 The saved alarm should be displayed in the alarms page.21 The saved alarm should be displayed in the alarms page.
15 4. Wait for the alarm to ring.22 4. Wait for the alarm to ring.
16 The alarm should ring (with haptic feedback) at the time set in the previous step and 23 The alarm should ring (with haptic feedback) at the time set in the previous step and
17 should show a notification with the buttons "Snooze" and "Ok".24 should show a notification with the buttons "Snooze" and "Ok".
18 5. Press "Ok" to dismiss the alarm.25 5. Press "Ok" to dismiss the alarm.
19 The alarm should be dismissed.26 The alarm should be dismissed.
2027
21id: alarm/edit-alarm-sound28id: clock-alarm/edit-alarm-sound
22plugin: manual29plugin: manual
23depends: alarm/trigger-alarm30depends: clock-alarm/trigger-alarm
24_summary: Edit alarm sound test31_summary: Edit alarm sound test
25estimated_duration: 12032estimated_duration: 120
26_description:33_description:
@@ -44,14 +51,14 @@
44 7. Press the back button and then save the alarm.51 7. Press the back button and then save the alarm.
45 You should be taken back to the alarms page after you save the alarm.52 You should be taken back to the alarms page after you save the alarm.
46 8. Wait for the alarm to ring.53 8. Wait for the alarm to ring.
47 The alarm should ring (with haptic feedback) at the time set in the previous step and 54 The alarm should ring (with haptic feedback) at the time set in the previous step and
48 should show a notification with the buttons "Snooze" and "Ok".55 should show a notification with the buttons "Snooze" and "Ok".
49 9. Press "Ok" to dismiss the alarm.56 9. Press "Ok" to dismiss the alarm.
50 The alarm should be dismissed.57 The alarm should be dismissed.
5158
52id: alarm/edit-alarm-focus59id: clock-alarm/edit-alarm-focus
53plugin: manual60plugin: manual
54depends: alarm/trigger-alarm61depends: clock-alarm/trigger-alarm
55_summary: Edit Alarm focus test62_summary: Edit Alarm focus test
56estimated_duration: 66063estimated_duration: 660
57_description:64_description:
@@ -73,20 +80,20 @@
73 7. Change the alarm time to ring in the next minute. Do not change any other options. Save Alarm.80 7. Change the alarm time to ring in the next minute. Do not change any other options. Save Alarm.
74 The saved alarm should be displayed in the alarms page.81 The saved alarm should be displayed in the alarms page.
75 8. Wait for the alarm to ring.82 8. Wait for the alarm to ring.
76 The alarm should ring (with haptic feedback) at the time set in the previous step and 83 The alarm should ring (with haptic feedback) at the time set in the previous step and
77 should show a notification with the buttons "Snooze" and "Ok".84 should show a notification with the buttons "Snooze" and "Ok".
78 9. Press "Ok" to dismiss the alarm.85 9. Press "Ok" to dismiss the alarm.
79 The alarm should be dismissed.86 The alarm should be dismissed.
8087
81id: alarm/silence-setting88id: clock-alarm/silence-setting
82plugin: manual89plugin: manual
83depends: alarm/trigger-alarm90depends: clock-alarm/trigger-alarm
84_summary: Alarm Silence after setting test91_summary: Alarm Silence after setting test
85estimated_duration: 66092estimated_duration: 660
86_description:93_description:
87 This test checks if the alarm's "silence after" setting is obeyed.94 This test checks if the alarm's "silence after" setting is obeyed.
88 1. Launch the clock app.95 1. Launch the clock app.
89 Clock app opens showing the current local time. 96 Clock app opens showing the current local time.
90 2. Click the settings icon shown in the top right.97 2. Click the settings icon shown in the top right.
91 The settings page is visible showing the alarm settings.98 The settings page is visible showing the alarm settings.
92 3. Set the silence after setting to 10 minutes.99 3. Set the silence after setting to 10 minutes.
@@ -99,23 +106,23 @@
99 message being displayed that "No saved alarms".106 message being displayed that "No saved alarms".
100 6. Press the plus icon to create a new alarm. Change the alarm time to ring in the next107 6. Press the plus icon to create a new alarm. Change the alarm time to ring in the next
101 minute. Do not change any other options. Save Alarm.108 minute. Do not change any other options. Save Alarm.
102 The saved alarm should be displayed in the alarms page. 109 The saved alarm should be displayed in the alarms page.
103 7. Wait for the alarm to ring.110 7. Wait for the alarm to ring.
104 The alarm should ring (with haptic feedback) at the time set in the previous step and 111 The alarm should ring (with haptic feedback) at the time set in the previous step and
105 should show a notification with the buttons "Snooze" and "Ok".112 should show a notification with the buttons "Snooze" and "Ok".
106 8. Allow the alarm to keep ringing.113 8. Allow the alarm to keep ringing.
107 The alarm should keep ringing and be silenced automatically by the phone only after114 The alarm should keep ringing and be silenced automatically by the phone only after
108 the duration set in step three.115 the duration set in step three.
109116
110id: alarm/vibration-setting117id: clock-alarm/vibration-setting
111plugin: manual118plugin: manual
112depends: alarm/trigger-alarm119depends: clock-alarm/trigger-alarm
113_summary: Alarm vibration setting test120_summary: Alarm vibration setting test
114estimated_duration: 120121estimated_duration: 120
115_description:122_description:
116 This test checks if the alarm vibration settings enables/disables the alarm vibration.123 This test checks if the alarm vibration settings enables/disables the alarm vibration.
117 1. Launch the clock app.124 1. Launch the clock app.
118 Clock app opens showing the current local time. 125 Clock app opens showing the current local time.
119 2. Click the settings icon shown in the top right.126 2. Click the settings icon shown in the top right.
120 The settings page is visible showing the alarm settings.127 The settings page is visible showing the alarm settings.
121 3. Toggle the alarm vibration settings to off position.128 3. Toggle the alarm vibration settings to off position.
@@ -127,22 +134,22 @@
127 message being displayed that "No saved alarms".134 message being displayed that "No saved alarms".
128 6. Press the plus icon to create a new alarm. Change the alarm time to ring in the next135 6. Press the plus icon to create a new alarm. Change the alarm time to ring in the next
129 minute. Do not change any other options. Save Alarm.136 minute. Do not change any other options. Save Alarm.
130 The saved alarm should be displayed in the alarms page. 137 The saved alarm should be displayed in the alarms page.
131 7. Wait for the alarm to ring.138 7. Wait for the alarm to ring.
132 Wait for the alarm to ring.139 Wait for the alarm to ring.
133 The alarm should ring at the time set in the previous step and should show a140 The alarm should ring at the time set in the previous step and should show a
134 notification with the buttons "Snooze" and "Ok". However there should be no141 notification with the buttons "Snooze" and "Ok". However there should be no
135 vibration when the alarm rings.142 vibration when the alarm rings.
136143
137id: alarm/snooze-setting144id: clock-alarm/snooze-setting
138plugin: manual145plugin: manual
139depends: alarm/trigger-alarm146depends: clock-alarm/trigger-alarm
140estimated_duration: 360147estimated_duration: 360
141_summary: Test the alarm snooze setting options148_summary: Test the alarm snooze setting options
142_description:149_description:
143 This test checks if the alarm snooze settings works as expected.150 This test checks if the alarm snooze settings works as expected.
144 1. Launch the clock app.151 1. Launch the clock app.
145 Clock app opens showing the current local time. 152 Clock app opens showing the current local time.
146 2. Click the settings icon shown in the top right.153 2. Click the settings icon shown in the top right.
147 The settings page is visible showing the alarm settings.154 The settings page is visible showing the alarm settings.
148 3. Set the snooze duration to 2 minutes.155 3. Set the snooze duration to 2 minutes.
@@ -155,9 +162,9 @@
155 message being displayed that "No saved alarms".162 message being displayed that "No saved alarms".
156 6. Press the plus icon to create a new alarm. Change the alarm time to ring in the next163 6. Press the plus icon to create a new alarm. Change the alarm time to ring in the next
157 minute. Do not change any other options. Save Alarm.164 minute. Do not change any other options. Save Alarm.
158 The saved alarm should be displayed in the alarms page. 165 The saved alarm should be displayed in the alarms page.
159 7. Wait for the alarm to ring.166 7. Wait for the alarm to ring.
160 The alarm should ring (with haptic feedback) at the time set in the previous step and 167 The alarm should ring (with haptic feedback) at the time set in the previous step and
161 should show a notification with the buttons "Snooze" and "Ok".168 should show a notification with the buttons "Snooze" and "Ok".
162 8. Press the "Snooze" button.169 8. Press the "Snooze" button.
163 The alarm should be snoozed.170 The alarm should be snoozed.
@@ -165,10 +172,10 @@
165 The alarm should ring again (with haptic feedback). Note that if an alarm is set to ring172 The alarm should ring again (with haptic feedback). Note that if an alarm is set to ring
166 originally at 10:00:00 and you snooze it the first time at 10:01:30, it should ring the next173 originally at 10:00:00 and you snooze it the first time at 10:01:30, it should ring the next
167 time at 10:03:30 and not at 10:02:00.174 time at 10:03:30 and not at 10:02:00.
168 175
169id: alarm/disable-alarm176id: clock-alarm/disable-alarm
170plugin: manual177plugin: manual
171depends: alarm/trigger-alarm178depends: clock-alarm/trigger-alarm
172estimated_duration: 360179estimated_duration: 360
173_summary: Test the alarm disable feature180_summary: Test the alarm disable feature
174_description:181_description:
@@ -186,9 +193,9 @@
186 5. Wait for the time to pass the alarm time.193 5. Wait for the time to pass the alarm time.
187 The alarm should not ring since it was disabled.194 The alarm should not ring since it was disabled.
188195
189id: alarm/refresh-one-alarm196id: clock-alarm/refresh-one-alarm
190plugin: manual197plugin: manual
191depends: alarm/trigger-alarm198depends: clock-alarm/trigger-alarm
192estimated_duration: 120199estimated_duration: 120
193_summary: Test the alarm page refresh issue200_summary: Test the alarm page refresh issue
194_description:201_description:
@@ -208,9 +215,9 @@
208 6. Check the status of the one-time alarm you just dismissed.215 6. Check the status of the one-time alarm you just dismissed.
209 The one-time alarm must be disabled since it was triggered and dismissed by the user.216 The one-time alarm must be disabled since it was triggered and dismissed by the user.
210217
211id: alarm/refresh-recurring-alarm218id: clock-alarm/refresh-recurring-alarm
212plugin: manual219plugin: manual
213depends: alarm/trigger-alarm220depends: clock-alarm/trigger-alarm
214estimated_duration: 120221estimated_duration: 120
215_summary: Test the alarm switch disable issue222_summary: Test the alarm switch disable issue
216_description:223_description:
217224
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/setting.pxu' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-setting.pxu' (properties changed: -x to +x)
--- tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/setting.pxu 2014-09-12 17:33:02 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-setting.pxu 2015-12-16 22:30:29 +0000
@@ -1,11 +1,18 @@
1id: setting/timezone-change1plugin: resource
2id: clock-setting/system-image
3_summary: [Automated] gather system information
4command: system-image-cli -i
5_description:
6 Gather system info
7
8id: clock-setting/timezone-change
2plugin: manual9plugin: manual
3_summary: Test to check if system timezone change is also done in the clock app10_summary: Test to check if system timezone change is also done in the clock app
4estimated_duration: 6011estimated_duration: 60
5_description:12_description:
6 Test to check if system timezone change also updates the time in the clock app.13 Test to check if system timezone change also updates the time in the clock app.
7 1. Launch the clock app.14 1. Launch the clock app.
8 Clock app opens showing the current local time. 15 Clock app opens showing the current local time.
9 2. Click the settings icon shown in the top right.16 2. Click the settings icon shown in the top right.
10 The settings page is visible showing the alarm settings.17 The settings page is visible showing the alarm settings.
11 3. Press the "Change time and date" settings option.18 3. Press the "Change time and date" settings option.
@@ -19,4 +26,4 @@
19 the new timezone time.26 the new timezone time.
20 6. Press the back button.27 6. Press the back button.
21 The main clock page is shown and the main clock also shows the new28 The main clock page is shown and the main clock also shows the new
22 timezone time. 29 timezone time.
2330
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/stopwatch.pxu' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-stopwatch.pxu'
--- tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/stopwatch.pxu 2015-09-11 13:13:17 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-stopwatch.pxu 2015-12-16 22:30:29 +0000
@@ -1,4 +1,11 @@
1id: stopwatch/language-change1plugin: resource
2id: clock-stopwatch/system-image
3_summary: [Automated] gather system information
4command: system-image-cli -i
5_description:
6 Gather system info
7
8id: clock-stopwatch/language-change
2plugin: manual9plugin: manual
3_summary: Test to check if stopwatch is working properly after timezone change, without closing Stopwatch10_summary: Test to check if stopwatch is working properly after timezone change, without closing Stopwatch
4estimated_duration: 60011estimated_duration: 600
@@ -11,7 +18,7 @@
11 3. Press the Start button.18 3. Press the Start button.
12 The main display starts counting time. The Start button disappears and the buttons Stop and Lap appear.19 The main display starts counting time. The Start button disappears and the buttons Stop and Lap appear.
13 4. Press the Lap button.20 4. Press the Lap button.
14 New lap row appears together with the lap header. 21 New lap row appears together with the lap header.
15 5. Switch to the system settings app. Navigate to Date & Time.22 5. Switch to the system settings app. Navigate to Date & Time.
16 The field with current timezone should be visible. Remember current timezone setting.23 The field with current timezone should be visible. Remember current timezone setting.
17 6. Press the current timezone field and change system timezone to something different.24 6. Press the current timezone field and change system timezone to something different.
1825
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/worldcity.pxu' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-worldcity.pxu' (properties changed: -x to +x)
--- tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/worldcity.pxu 2015-09-17 13:05:07 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/clock-worldcity.pxu 2015-12-16 22:30:29 +0000
@@ -1,4 +1,11 @@
1id: worldcity/language-change1plugin: resource
2id: clock-worldcity/system-image
3_summary: [Automated] gather system information
4command: system-image-cli -i
5_description:
6 Gather system info
7
8id: clock-worldcity/language-change
2plugin: manual9plugin: manual
3_summary: Test to check if world city language changes when the system language is changed10_summary: Test to check if world city language changes when the system language is changed
4estimated_duration: 60011estimated_duration: 600
512
=== modified file 'tests/manual/2014.com.ubuntu.clock:clock-tests/launcher/clock-test-cli'
--- tests/manual/2014.com.ubuntu.clock:clock-tests/launcher/clock-test-cli 2014-09-12 17:10:18 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/launcher/clock-test-cli 2015-12-16 22:30:29 +0000
@@ -3,19 +3,19 @@
3[welcome]3[welcome]
4text= Welcome to Clock App Manual Tests!4text= Welcome to Clock App Manual Tests!
5 This application will guide you through some manual test cases which5 This application will guide you through some manual test cases which
6 confirm the workings of the Clock application (part of Ubuntu Core 6 confirm the workings of the Clock application (part of Ubuntu Core
7 Applications) and its interaction with the system. The test suites are7 Applications) and its interaction with the system. The test suites are
8 split into various groups based on their functionality like alarm, 8 split into various groups based on their functionality like alarm,
9 settings etc.9 settings etc.
10 10
11 If all the actions produce the expected results listed, please submit11 If all the actions produce the expected results listed, please submit
12 a 'passed' result.12 a 'passed' result.
13 13
14 If an action fails, or produces an unexpected results, please submit a14 If an action fails, or produces an unexpected results, please submit a
15 'failed' result and file a bug. Please be sure to include the bug number15 'failed' result and file a bug. Please be sure to include the bug number
16 when you submit your result.16 when you submit your result.
1717
18[suite]18[suite]
19whitelist_filter = clock-app-.*19whitelist_filter = clock-.*
20whitelist_selection=.*20whitelist_selection=.*
21skip_test_selection = True21skip_test_selection = True
2222
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-alarm.whitelist' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-alarm.whitelist' (properties changed: -x to +x)
--- tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-alarm.whitelist 2014-09-12 13:36:45 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-alarm.whitelist 2015-12-16 22:30:29 +0000
@@ -1,2 +1,2 @@
1alarm/.*1clock-alarm/.*
22
33
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-setting.whitelist' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-setting.whitelist' (properties changed: -x to +x)
--- tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-setting.whitelist 2014-09-12 13:36:45 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-setting.whitelist 2015-12-16 22:30:29 +0000
@@ -1,1 +1,1 @@
1setting/.*1clock-setting/.*
22
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-stopwatch.whitelist' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-stopwatch.whitelist'
--- tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-stopwatch.whitelist 2015-09-10 08:49:17 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-stopwatch.whitelist 2015-12-16 22:30:29 +0000
@@ -1,1 +1,1 @@
1stopwatch/.*1clock-stopwatch/.*
22
=== renamed file 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-worldcity.whitelist' => 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-worldcity.whitelist' (properties changed: -x to +x)
--- tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-worldcity.whitelist 2015-08-23 09:35:44 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-worldcity.whitelist 2015-12-16 22:30:29 +0000
@@ -1,1 +1,1 @@
1worldcity/.*1clock-worldcity/.*

Subscribers

People subscribed via source and target branches