Merge lp:~nskaggs/music-app/click-mediascanner-tests into lp:music-app/trusty

[Nicholas Skaggs]

Add support for testing via click packages
Fix tests to work with new mediascanner

This change removes the need for example-content, and instead packages 2 ogg files and a mediascanner db for testing.

Add support for testing via click packages
Fix tests to work with new mediascanner

[lp:~nskaggs/music-app/click-mediascanner-tests]

131. By Nicholas Skaggs on 2013-09-27

cleanup for review

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

FAILED: Continuous integration, rev:131
http://91.189.93.70:8080/job/music-app-ci/80/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/535/console
    FAILURE: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/80/console
    FAILURE: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/80/console
    FAILURE: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/80/console
    FAILURE: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/80/console

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/music-app/click-mediascanner-tests]

132. By Nicholas Skaggs on 2013-09-27

add in db patching

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

FAILED: Continuous integration, rev:132
http://91.189.93.70:8080/job/music-app-ci/81/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/536
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/81
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/81
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/81
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/81

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Ok, this is amazing, but what if there is a change in mediascanner? Could this break? Are the "segments' dependent upon anything they might change in the future? Everything passes and looks good otherwise. I agree with this merge though and will push it regardless. balloons++

review: Approve

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

If mediascanner changes the way it writes db's, then yes this could break. I don't see that as something they are likely to do or undertake.

This is probably the most brute force and ugliest way of doing it, so I'm open to hear of another route. That said, I needed to still tweak this so it will run in the lab, as it gives an error (something different in the pathing and it's not finding things). Expect to see another MP for that. Sorry about that, should have taken off ready for review :-)

http://reports.qa.ubuntu.com/smokeng/saucy/touch_ro/4470/music-app-autopilot/439811/

Overall, I'm just glad the proof of concept worked :-)

[Nicholas Skaggs (nskaggs)]

Also, should probably be more pythonic and use the re module

=== modified file 'debian/control'
--- debian/control	2013-09-23 19:31:29 +0000
+++ debian/control	2013-09-27 21:56:07 +0000
@@ -18,7 +18,6 @@
          libqt5test5,
          python-mock,
          music-app (= ${source:Version}),
-         example-content,
          ubuntu-ui-toolkit-autopilot
 Description: Autopilot tests for Music App
  This package contains the autopilot tests for the Music App

=== added file 'tests/autopilot/music_app/content/1.ogg'
Binary files tests/autopilot/music_app/content/1.ogg	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/1.ogg	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/2.ogg'
Binary files tests/autopilot/music_app/content/2.ogg	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/2.ogg	2013-09-27 21:56:07 +0000 differ
=== removed file 'tests/autopilot/music_app/content/Benjamin_Kerensa_-_Foss_Yeaaaah___Radio_Edit_.ogg'
Binary files tests/autopilot/music_app/content/Benjamin_Kerensa_-_Foss_Yeaaaah___Radio_Edit_.ogg	2013-08-30 19:51:23 +0000 and tests/autopilot/music_app/content/Benjamin_Kerensa_-_Foss_Yeaaaah___Radio_Edit_.ogg	1970-01-01 00:00:00 +0000 differ
=== added directory 'tests/autopilot/music_app/content/mediascanner'
=== added directory 'tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db'
=== added file 'tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db/segments.gen'
Binary files tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db/segments.gen	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db/segments.gen	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db/segments_1'
Binary files tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db/segments_1	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db/segments_1	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/09756d0b-9d3f-4e6b-8f2f-8525fb99e5db/write.lock'
=== added directory 'tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c'
=== added file 'tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c/segments.gen'
Binary files tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c/segments.gen	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c/segments.gen	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c/segments_1'
Binary files tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c/segments_1	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c/segments_1	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/520da397-8f8b-4411-8aed-4de7a53bde8c/write.lock'
=== added directory 'tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa'
=== added file 'tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa/segments.gen'
Binary files tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa/segments.gen	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa/segments.gen	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa/segments_1'
Binary files tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa/segments_1	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa/segments_1	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/6fb4ad21-303d-41ad-88ee-925f409accfa/write.lock'
=== added directory 'tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605'
=== added file 'tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605/segments.gen'
Binary files tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605/segments.gen	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605/segments.gen	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605/segments_1'
Binary files tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605/segments_1	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605/segments_1	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/b6d687cb-c07d-4ea4-83db-d5404b9c9605/write.lock'
=== added directory 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3'
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_0.cfs'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_0.cfs	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_0.cfs	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_0_1.del'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_0_1.del	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_0_1.del	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_1.cfs'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_1.cfs	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_1.cfs	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_2.cfs'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_2.cfs	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_2.cfs	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_2_1.del'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_2_1.del	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_2_1.del	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_3.cfs'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_3.cfs	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/_3.cfs	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/segments.gen'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/segments.gen	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/segments.gen	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/segments_5'
Binary files tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/segments_5	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/segments_5	2013-09-27 21:56:07 +0000 differ
=== added file 'tests/autopilot/music_app/content/mediascanner/ea50858c-4b21-4f87-9005-40aa960a84a3/write.lock'
=== added file 'tests/autopilot/music_app/content/mediascanner/mediaindex'
--- tests/autopilot/music_app/content/mediascanner/mediaindex	1970-01-01 00:00:00 +0000
+++ tests/autopilot/music_app/content/mediascanner/mediaindex	2013-09-27 21:56:07 +0000
@@ -0,0 +1,22 @@
+[global]
+format=Ubuntu Media Scanner Meta Index 1.0
+
+[media:home/autopilot-music-app/Downloads]
+segments=b6d687cb-c07d-4ea4-83db-d5404b9c9605
+relative-path=home/autopilot-music-app/Downloads
+
+[media:home/autopilot-music-app/Music]
+segments=ea50858c-4b21-4f87-9005-40aa960a84a3
+relative-path=home/autopilot-music-app/Music
+
+[media:home/autopilot-music-app/Pictures]
+segments=520da397-8f8b-4411-8aed-4de7a53bde8c
+relative-path=home/autopilot-music-app/Pictures
+
+[media:home/autopilot-music-app/Videos]
+segments=09756d0b-9d3f-4e6b-8f2f-8525fb99e5db
+relative-path=home/autopilot-music-app/Videos
+
+[media:]
+segments=6fb4ad21-303d-41ad-88ee-925f409accfa
+relative-path=

=== modified file 'tests/autopilot/music_app/emulators/emulators.py'
--- tests/autopilot/music_app/emulators/emulators.py	2013-09-14 18:41:15 +0000
+++ tests/autopilot/music_app/emulators/emulators.py	2013-09-27 21:56:07 +0000
@@ -49,6 +49,12 @@
             tries = tries - 1
         return item
 
+    def tap_item(self, item):
+        self.pointing_device.move_to_object(item)
+        self.pointing_device.press()
+        sleep(2)
+        self.pointing_device.release()
+
     def get_play_button(self):
         return self.app.select_single("UbuntuShape", objectName = "playshape")
 

=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2013-09-15 13:43:45 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2013-09-27 21:56:07 +0000
@@ -37,6 +37,7 @@
     working_dir = os.getcwd()
     local_location_dir = os.path.dirname(os.path.dirname(working_dir))
     local_location = local_location_dir + "/music-app.qml"
+    installed_location = "/usr/share/music-app/music-app.qml"
 
     def setUp(self):
         self._patch_home()
@@ -45,8 +46,10 @@
         super(MusicTestCase, self).setUp()
         if os.path.exists(self.local_location):
             self.launch_test_local()
-        else:
+        elif os.path.exists(self.installed_location):
             self.launch_test_installed()
+        else:
+            self.launch_test_click()
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
@@ -57,41 +60,69 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/music-app/music-app.qml",
+            self.installed_location,
             "--desktop_file_hint=/usr/share/applications/music-app.desktop",
             app_type='qt')
 
+    def launch_test_click(self):
+        self.app = self.launch_click_package(
+            "com.ubuntu.music-app",
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
     def _patch_home(self):
+        #make a temp dir
         temp_dir = tempfile.mkdtemp()
+        #delete it, and recreate it to the length
+        #required so our patching the db works
+        #require a length of 25
+        shutil.rmtree(temp_dir)
+        temp_dir = temp_dir.ljust(25, 'X')
+        os.mkdir(temp_dir)
         self.addCleanup(shutil.rmtree, temp_dir)
         patcher = mock.patch.dict('os.environ', {'HOME': temp_dir})
         patcher.start()
         self.addCleanup(patcher.stop)
 
     def _create_music_library(self):
+        #use fake home
         home = os.environ['HOME']
         musicpath = home + '/Music'
+        mediascannerpath = home + '/.cache/mediascanner'
         os.mkdir(musicpath)
 
-        # this needs the package 'example-content' installed:
-        shutil.copy('/usr/share/example-content/'
-            +'Ubuntu_Free_Culture_Showcase/Josh Woodward - Swansong.ogg',
-            musicpath)
+        #copy over our index
+        shutil.copytree(self.working_dir + '/music_app/content/mediascanner',
+                        mediascannerpath)
 
         if os.path.exists(self.local_location):
             shutil.copy(self.working_dir + '/music_app/content/'
-                +'Benjamin_Kerensa_-_Foss_Yeaaaah___Radio_Edit_.ogg',
+                +'1.ogg',
+                musicpath)
+            shutil.copy(self.working_dir + '/music_app/content/'
+                +'2.ogg',
                 musicpath)
         else:
             shutil.copy('/usr/lib/python2.7/dist-packages/music_app/content/'
-            +'Benjamin_Kerensa_-_Foss_Yeaaaah___Radio_Edit_.ogg',
-            musicpath)
-
-    def tap_item(self, item):
-        self.pointing_device.move_to_object(item)
-        self.pointing_device.press()
-        sleep(1)
-        self.pointing_device.release()
+            +'1.ogg',
+            musicpath)
+            shutil.copy('/usr/lib/python2.7/dist-packages/music_app/content/'
+            +'2.ogg',
+            musicpath)
+
+        #do some inline db patching
+        #patch mediaindex to proper home
+        #these values are dependent upon our sampled db
+        relhome = home[1:]
+        dblocation = "home/autopilot-music-app"
+        dbfoldername = "ea50858c-4b21-4f87-9005-40aa960a84a3"
+        #patch mediaindex
+        os.system("sed -i 's!" + dblocation + "!" + str(relhome) + "!g' " + str(mediascannerpath) + "/mediaindex")
+
+        #patch file indexes
+        os.system("sed -i 's!" + dblocation + "!" + str(relhome) + "!g' " + str(mediascannerpath) + "/" + dbfoldername + "/_0.cfs")
+        os.system("sed -i 's!" + dblocation + "!" + str(relhome) + "!g' " + str(mediascannerpath) + "/" + dbfoldername + "/_1.cfs")
+        os.system("sed -i 's!" + dblocation + "!" + str(relhome) + "!g' " + str(mediascannerpath) + "/" + dbfoldername + "/_2.cfs")
+        os.system("sed -i 's!" + dblocation + "!" + str(relhome) + "!g' " + str(mediascannerpath) + "/" + dbfoldername + "/_3.cfs")
 
     @property
     def main_view(self):