Merge lp:~canonical-platform-qa/gallery-app/fix1381273-no_tmp into lp:gallery-app

[Leo Arias]

Do not use temporary directories for autopilot tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1102
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1066/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/241
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/241
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/489
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4090
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/811
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14691
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4419/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1066/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/gallery-app/fix1381273-no_tmp]

1103. By Leo Arias on 2014-10-15

Fixed the year.

Unmerged revisions

1103. By Leo Arias on 2014-10-15

Fixed the year.

1102. By Leo Arias on 2014-10-14

Do not use temporary directories for autopilot tests.

=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
--- tests/autopilot/gallery_app/tests/__init__.py	2014-09-19 04:22:12 +0000
+++ tests/autopilot/gallery_app/tests/__init__.py	2014-10-15 00:11:22 +0000
@@ -1,9 +1,20 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This file is part of gallery-app.
+#
+# gallery-app is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# gallery-app is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
 """gallery autopilot tests."""
 
@@ -47,8 +58,6 @@
           'database/gallery.sqlite'
     _thumbs = '~/.cache/com.ubuntu.gallery/thumbnails'
 
-    _default_sample_destination_dir = "/tmp/gallery-ap_sd"
-
     ARGS = []
 
     @property
@@ -76,19 +85,16 @@
             else:
                 return EnvironmentTypes.click
 
-    def _get_sample_destination_dir(self, env_type):
-        if env_type == EnvironmentTypes.click:
-            pic_dir = os.path.expanduser("~/Pictures")
-            pic_bak_dir = pic_dir + '.apbak'
-            # Only save and restore if it previously existed
-            if os.path.exists(pic_dir):
-                shutil.move(pic_dir, pic_bak_dir)
-                self.addCleanup(
-                    logger.debug, "Restoring backed up pics to %s" % pic_dir)
-                self.addCleanup(shutil.move, pic_bak_dir, pic_dir)
-            return pic_dir
-        else:
-            return self._default_sample_destination_dir
+    def _get_sample_destination_dir(self):
+        pic_dir = os.path.expanduser("~/Pictures")
+        pic_bak_dir = pic_dir + '.apbak'
+        # Only save and restore if it previously existed
+        if os.path.exists(pic_dir):
+            shutil.move(pic_dir, pic_bak_dir)
+            self.addCleanup(
+                logger.debug, "Restoring backed up pics to %s" % pic_dir)
+            self.addCleanup(shutil.move, pic_bak_dir, pic_dir)
+        return pic_dir
 
     def configure_db(self):
         db = os.path.expanduser(self._db)
@@ -117,8 +123,7 @@
 
     def configure_sample_files(self, env_type):
         self.sample_dir = resource_filename('gallery_app', 'data')
-        self.sample_destination_dir = \
-            self._get_sample_destination_dir(env_type)
+        self.sample_destination_dir = self._get_sample_destination_dir()
         if (os.path.exists(self.sample_destination_dir)):
             shutil.rmtree(self.sample_destination_dir)
         self.assertFalse(os.path.exists(self.sample_destination_dir))
@@ -180,7 +185,6 @@
 
     def launch_test_local(self):
         logger.debug("Launching local gallery-app binary.")
-        self.ARGS.append(self.sample_destination_dir)
         self.app = self.launch_test_application(
             self.local_location,
             *self.ARGS,
@@ -191,7 +195,6 @@
             logger.debug(
                 "Launching installed gallery-app binary for desktop."
             )
-            self.ARGS.append(self.sample_destination_dir)
             self.app = self.launch_test_application(
                 "gallery-app",
                 *self.ARGS,
@@ -202,7 +205,6 @@
             )
             self.ARGS.append("--desktop_file_hint="
                              "/usr/share/applications/gallery-app.desktop")
-            self.ARGS.append(self.sample_destination_dir)
             self.app = self.launch_test_application(
                 "gallery-app",
                 *self.ARGS,