Merge lp:~sergiusens/music-app/test_asset_location into lp:music-app/trusty

[Sergio Schvezov]

Using package location to determine asset location

[Andy Doan (doanac)]

review: Approve

[Victor Thompson (vthompson)]

Appears to work straight from the branch.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2013-10-14 14:24:55 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2013-10-15 15:40:57 +0000
@@ -15,6 +15,7 @@
 import shutil
 #import subprocess
 import logging
+import music_app
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
@@ -139,10 +140,8 @@
         logger.debug("Mediascanner path set to %s" % mediascannerpath)
 
         #set content path
-        if self.test_type == 'local' or self.test_type == 'click':
-            content_dir = os.path.join(self.working_dir, 'music_app/content/')
-        else:
-            content_dir = '/usr/lib/python2.7/dist-packages/music_app/content/'
+        content_dir = os.path.join(os.path.dirname(music_app.__file__),
+                                   'content')
 
         logger.debug("Content dir set to %s" % content_dir)