Merge lp:~vthompson/music-app/fix-ap-instructions into lp:music-app

[Victor Thompson]

* Fix typo in README.autopilot and clarify the instructions

* Fix typo in README.autopilot and clarify the instructions

While going through these instructions to document the steps for the Weather app, I noticed this typo.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:888
http://91.189.93.70:8080/job/music-app-ci/1343/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/195

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1343/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-ap-instructions]

889. By Victor Thompson on 2015-07-19

Add password param

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:889
http://91.189.93.70:8080/job/music-app-ci/1344/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/196

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1344/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

One inline note :-)

review: Needs Fixing

[lp:~vthompson/music-app/fix-ap-instructions]

890. By Victor Thompson on 2015-07-23

Update instructions per weather app updates.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:890
http://91.189.93.70:8080/job/music-app-ci/1346/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/198

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1346/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-ap-instructions]

891. By Victor Thompson on 2015-08-04

Merge of trunk of resolve conflicts

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:891
http://91.189.93.70:8080/job/music-app-ci/1354/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/206

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1354/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

=== modified file 'README.autopilot'
--- README.autopilot	2015-05-13 23:51:26 +0000
+++ README.autopilot	2015-08-04 23:44:56 +0000
@@ -2,23 +2,26 @@
 
 Music App follows a test driven development where autopilot tests are run before every merge into trunk. If you are submitting your bugfix/patch to the music app, please follow the following steps below to ensure that all tests pass before proposing a merge request.
 
-If you are looking for more info about Autopilot or writing AP tests for the music app, here are some useful links to help you,
-
-- http://developer.ubuntu.com/api/devel/ubuntu-14.10/python/autopilot/
-- http://developer.ubuntu.com/api/devel/ubuntu-14.10/python/autopilot-emulator/
+If you are looking for more info about Autopilot or writing AP tests for the music app, here are some useful links to help you:
+
+- http://developer.ubuntu.com/start/quality
+- https://developer.ubuntu.com/api/autopilot/python/1.5.0/
+
+For help and options on running tests, see:
+
+- https://developer.ubuntu.com/en/start/platform/guides/running-autopilot-tests/
 
 ## Prerequisites
 
 Install the following autopilot packages required to run the tests,
-$ sudo apt-get install python-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot python3-autopilot-vis
-
+$ sudo apt-get install python3-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot python3-autopilot-vis
 
 ## Running tests on the desktop
 
 Using terminal:
 
 *  Branch the music app code, for example,
-    $ bzr branch lp:music-ap
+    $ bzr branch lp:music-app
     
 *  Navigate to the tests/autopilot directory.
     $ cd music-app/tests/autopilot
@@ -46,5 +49,14 @@
 
 Using autopkg:
 
-1. navigate to the directory where the music-app branch is and run:
-  $ adt-run music-app --click=com.ubuntu.music --- ssh -s adb
+*  Branch the Music app code, for example,
+    $ bzr branch lp:music-app
+
+*  Navigate to the source directory.
+    $ cd music-app
+
+*  Build a click package
+    $ click-buddy .
+
+*  Run the tests on device (assumes only one click package in the directory)
+    $ adt-run . *.click --- ssh -s adb -- -p <PASSWORD>

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-26 22:43:31 +0000
+++ debian/changelog	2015-08-04 23:44:56 +0000
@@ -3,6 +3,7 @@
   [ Victor Thompson ]
   * Fix SongsView album art for albums and genres (LP: #1477366)
   * Fix to allow the LibraryEmptyState to work again (LP: #1478162)
+  * Fix typo in README.autopilot and clarify the instructions
 
   [ Andrew Hayzen ]
   * Fix for console errors when using the parent changed helpers