1
=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
2
--- tests/autopilot/gallery_app/tests/__init__.py	2014-10-20 19:50:32 +0000
3
+++ tests/autopilot/gallery_app/tests/__init__.py	2014-10-20 19:50:32 +0000
4
@@ -1,6 +1,6 @@
5
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
6
2
#
2
#
8
3
# Copyright (C) 2014 Canonical Ltd.
3
# Copyright (C) 2012, 2014 Canonical Ltd.
9
4
#
4
#
10
5
# This file is part of gallery-app.
5
# This file is part of gallery-app.
11
6
#
6
#
12
@@ -22,6 +22,7 @@
13
22
import logging
22
import logging
14
23
import shutil
23
import shutil
15
24
import signal
24
import signal
16
25
from time import sleep
17
25
26
18
26
from testtools.matchers import Equals, NotEquals, GreaterThan
27
from testtools.matchers import Equals, NotEquals, GreaterThan
19
27
from autopilot.matchers import Eventually
28
from autopilot.matchers import Eventually
20
@@ -35,11 +36,13 @@
21
35
from gallery_app.emulators import main_screen
36
from gallery_app.emulators import main_screen
22
36
from gallery_app.emulators.gallery_utils import GalleryUtils
37
from gallery_app.emulators.gallery_utils import GalleryUtils
23
37
38
24
38
from time import sleep
25
39
26
40
logger = logging.getLogger(__name__)
39
logger = logging.getLogger(__name__)
27
41
40
28
42
41
29
42
class GalleryException(Exception):
30
43
    pass
31
44
32
45
33
43
class GalleryTestCase(AutopilotTestCase):
46
class GalleryTestCase(AutopilotTestCase):
34
44
47
35
45
    """A common test case class that provides several useful methods for
48
    """A common test case class that provides several useful methods for
36
@@ -76,24 +79,13 @@
37
76
            return fixture_setup.Launcher.installed_click
79
            return fixture_setup.Launcher.installed_click
38
77
80
39
78
    def _get_sample_destination_dir(self):
81
    def _get_sample_destination_dir(self):
49
79
        pic_dir = os.path.expanduser("~/Pictures")
82
        return os.path.expanduser('~/Pictures')
41
80
        pic_bak_dir = pic_dir + '.apbak'
42
81
        # Only save and restore if it previously existed
43
82
        if os.path.exists(pic_dir):
44
83
            shutil.move(pic_dir, pic_bak_dir)
45
84
            self.addCleanup(
46
85
                logger.debug, "Restoring backed up pics to %s" % pic_dir)
47
86
            self.addCleanup(shutil.move, pic_bak_dir, pic_dir)
48
87
        return pic_dir
50
88
83
51
89
    def configure_db(self):
84
    def configure_db(self):
52
90
        db = os.path.expanduser(self._db)
85
        db = os.path.expanduser(self._db)
53
91
        db_bak = db + '.apbak'
54
92
        # Only save and restore if it previously existed
55
93
        if os.path.exists(db):
86
        if os.path.exists(db):
59
94
            shutil.move(db, db_bak)
87
            os.remove(db)
60
95
            self.addCleanup(shutil.move, db_bak, db)
88
        elif not os.path.exists(os.path.dirname(db)):
58
96
        if not os.path.exists(os.path.dirname(db)):
61
97
            os.makedirs(os.path.dirname(db))
89
            os.makedirs(os.path.dirname(db))
62
98
        mock_db = os.path.join(self.sample_destination_dir, '.database',
90
        mock_db = os.path.join(self.sample_destination_dir, '.database',
63
99
                               'gallery_confined.sqlite')
91
                               'gallery_confined.sqlite')
64
@@ -101,12 +93,9 @@
65
101
93
66
102
    def configure_thumbnails(self):
94
    def configure_thumbnails(self):
67
103
        thumbs = os.path.expanduser(self._thumbs)
95
        thumbs = os.path.expanduser(self._thumbs)
68
104
        thumbs_bak = thumbs + '.apbak'
69
105
        # Only save and restore if it previously existed
70
106
        if os.path.exists(thumbs):
96
        if os.path.exists(thumbs):
74
107
            shutil.move(thumbs, thumbs_bak)
97
            shutil.rmtree(thumbs)
75
108
            self.addCleanup(shutil.move, thumbs_bak, thumbs)
98
        elif not os.path.exists(os.path.dirname(thumbs)):
73
109
        if not os.path.exists(os.path.dirname(thumbs)):
76
110
            os.makedirs(os.path.dirname(thumbs))
99
            os.makedirs(os.path.dirname(thumbs))
77
111
        mock_thumbs = os.path.join(self.sample_destination_dir, '.thumbnails')
100
        mock_thumbs = os.path.join(self.sample_destination_dir, '.thumbnails')
78
112
        shutil.move(mock_thumbs, thumbs)
101
        shutil.move(mock_thumbs, thumbs)
79
@@ -114,9 +103,14 @@
80
114
    def configure_sample_files(self, env_type):
103
    def configure_sample_files(self, env_type):
81
115
        self.sample_dir = resource_filename('gallery_app', 'data')
104
        self.sample_dir = resource_filename('gallery_app', 'data')
82
116
        self.sample_destination_dir = self._get_sample_destination_dir()
105
        self.sample_destination_dir = self._get_sample_destination_dir()
86
117
        if (os.path.exists(self.sample_destination_dir)):
106
        if os.path.exists(self.sample_destination_dir):
87
118
            shutil.rmtree(self.sample_destination_dir)
107
            try:
88
119
        self.assertFalse(os.path.exists(self.sample_destination_dir))
108
                os.rmdir(self.sample_destination_dir)
89
109
            except OSError:
90
110
                raise GalleryException('The pictures directory is not empty.')
91
111
92
112
        self.addCleanup(shutil.rmtree, self.sample_destination_dir)
93
113
        self.addCleanup(os.mkdir, self.sample_destination_dir)
94
120
114
95
121
        self.sample_file = os.path.join(
115
        self.sample_file = os.path.join(
96
122
            self.sample_destination_dir,
116
            self.sample_destination_dir,
97
@@ -132,9 +126,8 @@
98
132
        self.sample_file_source = \
126
        self.sample_file_source = \
99
133
            default_data_dir + self.sample_file_source
127
            default_data_dir + self.sample_file_source
100
134
128
104
135
        if env_type is fixture_setup.Launcher.installed_click:
129
        self.configure_db()
105
136
            self.configure_db()
130
        self.configure_thumbnails()
103
137
            self.configure_thumbnails()
106
138
131
107
139
    def do_reset_config(self):
132
    def do_reset_config(self):
108
140
        config = os.path.expanduser(
133
        config = os.path.expanduser(
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-10-15	Pending
Ubuntu Phablet Team		2014-10-15	Pending
Review via email: mp+238383@code.launchpad.net