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 |
Related bugs: |
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.
PASSED: Continuous integration, rev:423 /core-apps- jenkins. ubuntu. com/job/ clock-app- ci/25/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/264/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ clock-app- ci/25/rebuild
https:/