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

[Sergio Schvezov]

Test cleanup and initial click support

[Nicholas Skaggs (nskaggs)]

This is incorporated into https://code.launchpad.net/~nskaggs/music-app/apfixes-for-mir/+merge/190708

Unmerged revisions

=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2013-10-09 18:34:16 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2013-10-11 16:03:49 +0000
@@ -41,17 +41,28 @@
     local_location = local_location_dir + "/music-app.qml"
     installed_location = "/usr/share/music-app/music-app.qml"
 
+    def setup_environment(self):
+        if os.path.exists(self.local_location):
+            launch = self.launch_test_local
+            test_type = 'deb'
+        elif os.path.exists(self.installed_location):
+            launch = self.launch_test_installed
+            test_type = 'local'
+        else:
+            launch = self.launch_test_click
+            test_type = 'click'
+        return launch, test_type
+
     def setUp(self):
-        self._patch_home()
+        launch, self.test_type = self.setup_environment()
+        if self.test_type != 'click':
+            self._patch_home()
+        else:
+            self.home_dir = self._save_home()
         self._create_music_library()
         self.pointing_device = Pointer(self.input_device_class.create())
         super(MusicTestCase, self).setUp()
-        if os.path.exists(self.local_location):
-            self.launch_test_local()
-        elif os.path.exists(self.installed_location):
-            self.launch_test_installed()
-        else:
-            self.launch_test_click()
+        launch()
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
@@ -73,6 +84,22 @@
             "com.ubuntu.music",
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def _save_home(self):
+        logger.debug('Saving HOME')
+        home_dir = os.environ['HOME']
+        backup_list = ('Music', '.cache/mediascanner')
+        backup_path = [os.path.join(home_dir, i) for i in backup_list]
+        backups = [(i, '%s.bak' % i) for i in backup_path if os.path.exists(i)]
+        for b in backups:
+            logger.debug('backing up %s to %s' % b)
+            try:
+                shutil.rmtree(b[1])
+            except:
+                pass
+            shutil.move(b[0], b[1])
+            #self.addCleanup(shutil.move(b[1], b[0]))
+        return home_dir
+
     def _patch_home(self):
         #make a temp dir
         temp_dir = tempfile.mkdtemp()
@@ -96,34 +123,27 @@
         patcher.start()
         logger.debug("Patched home to fake home directory " + temp_dir)
         self.addCleanup(patcher.stop)
+        return temp_dir
 
     def _create_music_library(self):
-        #use fake home
-        home = os.environ['HOME']
-        logger.debug("Home set to " + home)
-        musicpath = home + '/Music'
-        logger.debug("Music path set to " + musicpath)
-        mediascannerpath = home + '/.cache/mediascanner'
+        logger.debug("Home set to %s" % self.home_dir)
+        musicpath = os.path.join(self.home_dir, 'Music')
+        logger.debug("Music path set to %s" % musicpath)
+        mediascannerpath = os.path.join(self.home_dir, '.cache/mediascanner')
         os.mkdir(musicpath)
-        logger.debug("Mediascanner path set to " + mediascannerpath)
-
-        #copy over the music and index
-        if os.path.exists(self.local_location):
-            shutil.copy(self.working_dir + '/music_app/content/'
-                        + '1.ogg',
-                        musicpath)
-            shutil.copy(self.working_dir + '/music_app/content/'
-                        + '2.ogg',
-                        musicpath)
-            shutil.copytree(self.working_dir +
-                            '/music_app/content/mediascanner',
-                            mediascannerpath)
-
+        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:
-            pkg_dir = '/usr/lib/python2.7/dist-packages/music_app/'
-            shutil.copy(pkg_dir + 'content/' + '1.ogg', musicpath)
-            shutil.copy(pkg_dir + 'content/' + '2.ogg', musicpath)
-            shutil.copytree(pkg_dir + 'content/mediascanner', mediascannerpath)
+            content_dir = '/usr/lib/python2.7/dist-packages/music_app/content/'
+
+        #copy content
+        shutil.copy(os.path.join(content_dir, '1.ogg'), musicpath)
+        shutil.copy(os.path.join(content_dir, '2.ogg'), musicpath)
+        shutil.copytree(os.path.join(content_dir, 'mediascanner'),
+                        mediascannerpath)
 
         logger.debug("Music copied, files " + str(os.listdir(musicpath)))
         logger.debug(
@@ -134,7 +154,7 @@
         #patch mediaindex to proper home
         #these values are dependent upon our sampled db
         logger.debug("Patching fake mediascanner database")
-        relhome = home[1:]
+        relhome = self.home_dir[1:]
         dblocation = "home/autopilot-music-app"
         dbfoldername = "ea50858c-4b21-4f87-9005-40aa960a84a3"
         #patch mediaindex
@@ -142,14 +162,9 @@
                                 "/mediaindex", dblocation, relhome)
 
         #patch file indexes
-        self._file_find_replace(mediascannerpath + "/" +
-                                dbfoldername + "/_0.cfs", dblocation, relhome)
-        self._file_find_replace(mediascannerpath + "/" +
-                                dbfoldername + "/_1.cfs", dblocation, relhome)
-        self._file_find_replace(mediascannerpath + "/" +
-                                dbfoldername + "/_2.cfs", dblocation, relhome)
-        self._file_find_replace(mediascannerpath + "/" +
-                                dbfoldername + "/_3.cfs", dblocation, relhome)
+        index_template = '%s/%s/_%%s.cfs' % (mediascannerpath, dbfoldername)
+        for i in range(4):
+            self._file_find_replace(index_template % i, dblocation, relhome)
 
     def _file_find_replace(self, in_filename, find, replace):
         #replace all occurences of string find with string replace