1
=== modified file 'ubuntu_system_tests/common/config.py'
2
--- ubuntu_system_tests/common/config.py	2017-03-06 17:27:25 +0000
3
+++ ubuntu_system_tests/common/config.py	2017-03-14 11:03:55 +0000
4
@@ -211,10 +211,9 @@
5
211
        default='qemu',
211
        default='qemu',
6
212
        help_string='Type of target. Either qemu or adb.'),
212
        help_string='Type of target. Either qemu or adb.'),
7
213
    options.Option(
213
    options.Option(
9
214
        'package_type',
214
        'unity8_mode',
10
215
        default='deb',
215
        default='deb',
13
216
        help_string='Which unity8 package type should be installed during '
216
        help_string='Which unity8 session to use, either deb or snap.'),
12
217
                    'setup. Either snap or deb.'),
14
218
]
217
]
15
219
218
16
220
219
17
221
220
18
=== modified file 'ubuntu_system_tests/helpers/addressbook/app.py'
19
--- ubuntu_system_tests/helpers/addressbook/app.py	2017-02-08 15:03:35 +0000
20
+++ ubuntu_system_tests/helpers/addressbook/app.py	2017-03-14 11:03:55 +0000
21
@@ -18,21 +18,20 @@
22
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
23
19
#
19
#
24
20
from collections import namedtuple
20
from collections import namedtuple
26
21
from ubuntu_system_tests.helpers.application import Application
21
from ubuntu_system_tests.helpers.application import Snap
27
22
22
28
23
APP_NAME = 'Contacts'
23
APP_NAME = 'Contacts'
29
24
APP_ID = 'address-book-app'
24
APP_ID = 'address-book-app'
30
25
APP_SNAP = 'address-book-app'
31
26
25
32
27
26
33
28
Contact = namedtuple('Contact', ['name', 'number', 'expected_reply'])
27
Contact = namedtuple('Contact', ['name', 'number', 'expected_reply'])
34
29
Contact.__new__.__defaults__ = (None, None, None)
28
Contact.__new__.__defaults__ = (None, None, None)
35
30
29
36
31
30
38
32
class AddressBook(Application):
31
class AddressBook(Snap):
39
33
32
40
34
    def __init__(self):
33
    def __init__(self):
42
35
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
34
        super().__init__(APP_NAME, APP_ID)
43
36
35
44
37
    def get_main_view(self):
36
    def get_main_view(self):
45
38
        # TODO Move the address book helper upstream migrating the
37
        # TODO Move the address book helper upstream migrating the
46
39
38
47
=== modified file 'ubuntu_system_tests/helpers/application.py'
48
--- ubuntu_system_tests/helpers/application.py	2017-03-08 01:00:05 +0000
49
+++ ubuntu_system_tests/helpers/application.py	2017-03-14 11:03:55 +0000
50
@@ -29,76 +29,75 @@
51
29
29
52
30
from ubuntu_system_tests.helpers import autopilot
30
from ubuntu_system_tests.helpers import autopilot
53
31
from ubuntu_system_tests.helpers import processes
31
from ubuntu_system_tests.helpers import processes
56
32
from ubuntu_system_tests.helpers.scopes.apps import (
32
from ubuntu_system_tests.helpers.snap import (
57
33
    launch_application_from_apps_scope)
33
    get_snap_revision,
58
34
    is_installed as is_snap_installed,
59
35
)
60
34
from ubuntu_system_tests.helpers.unity8.utils import (
36
from ubuntu_system_tests.helpers.unity8.utils import (
61
35
    is_unity8_snap,
37
    is_unity8_snap,
62
36
    launch_application_from_launcher,
38
    launch_application_from_launcher,
63
37
)
39
)
64
38
from ubuntu_system_tests.helpers.utils import is_discovery
40
from ubuntu_system_tests.helpers.utils import is_discovery
65
39
41
66
40
UNITY8_DEB_CMD_PREFIX = ''
67
41
UNITY8_SNAP_CMD_PREFIX = 'unity8-session.'
68
42
APP_SNAP_URL = 'appid://{n}/{n}/current-user-version'
69
43
APP_DEB_URL = 'application:///{n}.desktop'
70
44
71
45
logger = logging.getLogger(__name__)
42
logger = logging.getLogger(__name__)
89
46
43
logger.setLevel(logging.INFO)
90
47
44
91
48
class ApplicationManagerBase:
45
92
49
    """Base class to launch and close unity8 apps."""
46
class Application:
93
50
47
    __metaclass__ = ABCMeta
94
51
    def __init__(self, name, cmd_prefix, launch_param):
48
95
52
        self.name = name
49
    def __init__(self, app_name, app_id):
96
53
        self.cmd_prefix = cmd_prefix
50
        """
97
54
        self.launch_param = launch_param
51
        :param app_name: Display name for application.
98
55
        self.rev_id = self._get_rev_id()
52
        :param app_id: Application id.
99
56
53
        """
100
57
    def _get_app_ids(self):
54
        self.app_name = app_name
101
58
        """Return list of installed app ids."""
55
        self.app_id = app_id
102
59
        return subprocess.check_output(
56
        self.proxy_object = None
103
60
            self._get_ids_command()).decode().splitlines()
57
        self.cmd_prefix = None
104
61
58
105
62
    def _get_rev_id(self):
59
    def _get_cmd_prefix(self):
106
60
        """Return prefix to use with all ubuntu-app-launch commands.
107
61
        This will depend on whether unity8 is running from a snap
108
62
        session or not.
109
63
        """
110
64
        if self.cmd_prefix is None:
111
65
            self.cmd_prefix = 'unity8-session.' if is_unity8_snap() else ''
112
66
        return self.cmd_prefix
113
67
114
68
    @abstractmethod
115
69
    def _get_app_rev_id(self, app_id):
116
63
        """Return the application revision ID."""
70
        """Return the application revision ID."""
124
64
        for app_id in self._get_app_ids():
71
        pass
118
65
            if app_id.startswith(self.name):
119
66
                return app_id
120
67
        logger.warning(
121
68
            'No id found for app: {}. '
122
69
            'Proceeding with this id value.'.format(self.name))
123
70
        return self.name
125
71
72
126
72
    def _get_start_command(self):
73
    def _get_start_command(self):
127
73
        """Return command to start application."""
74
        """Return command to start application."""
128
74
        return [
75
        return [
131
75
            self.cmd_prefix + 'url-dispatcher',
76
            self._get_cmd_prefix() + 'url-dispatcher',
132
76
            self.launch_param.format(n=self.name)]
77
            self._get_launch_params()]
133
77
78
134
78
    def _get_stop_command(self):
79
    def _get_stop_command(self):
135
79
        """Return command to stop application."""
80
        """Return command to stop application."""
137
80
        return [self.cmd_prefix + 'ubuntu-app-stop', self.rev_id]
81
        id = self._get_app_rev_id()
138
82
        return [self._get_cmd_prefix() + 'ubuntu-app-stop', id]
139
81
83
140
82
    def _get_pid_command(self):
84
    def _get_pid_command(self):
141
83
        """Return command to get application process ID."""
85
        """Return command to get application process ID."""
151
84
        return [self.cmd_prefix + 'ubuntu-app-pid', self.rev_id]
86
        id = self._get_app_rev_id()
152
85
87
        return [self._get_cmd_prefix() + 'ubuntu-app-pid', id]
144
86
    def _get_ids_command(self):
145
87
        """Return command to get list of available application IDs."""
146
88
        return [self.cmd_prefix + 'ubuntu-app-launch-appids']
147
89
148
90
    def launch(self):
149
91
        """Launch application."""
150
92
        subprocess.check_call(self._get_start_command())
153
93
88
154
94
    def stop(self):
89
    def stop(self):
155
95
        """Stop application."""
90
        """Stop application."""
157
96
        subprocess.check_call(self._get_stop_command())
91
        cmd = self._get_stop_command()
158
92
        logger.info('application stop command: {}'.format(' '.join(cmd)))
159
93
        subprocess.check_call(cmd)
160
97
94
162
98
    def pid(self):
95
    def get_pid(self):
163
99
        """Return application process ID."""
96
        """Return application process ID."""
164
97
        cmd = self._get_pid_command()
165
98
        logger.info('application pid command: {}'.format(' '.join(cmd)))
166
100
        try:
99
        try:
168
101
            out = subprocess.check_output(self._get_pid_command()).decode()
100
            out = subprocess.check_output(cmd).decode()
169
102
        except subprocess.CalledProcessError:
101
        except subprocess.CalledProcessError:
170
103
            pass
102
            pass
171
104
        else:
103
        else:
172
@@ -106,84 +105,24 @@
173
106
                if line.isdigit():
105
                if line.isdigit():
174
107
                    return line
106
                    return line
175
108
        raise RuntimeError(
107
        raise RuntimeError(
177
109
            'Process ID not found for app ID: {}'.format(self.rev_id))
108
            'Process ID not found for app ID: {}'.format(self.app_id))
178
110
109
179
111
    def running(self):
110
    def running(self):
180
112
        """Return boolean to indicate if application is running."""
111
        """Return boolean to indicate if application is running."""
181
113
        return subprocess.call(self._get_pid_command()) == 0
112
        return subprocess.call(self._get_pid_command()) == 0
182
114
113
255
115
    def installed(self):
114
    def launch(self):
256
116
        """Return boolean to indicate if application is installed."""
115
        """Launch application using command."""
257
117
        app_ids = self._get_app_ids()
116
        cmd = self._get_start_command()
258
118
        return any(app_id.startswith(self.rev_id) for app_id in app_ids)
117
        logger.info('application launch command: {}'.format(' '.join(cmd)))
259
119
118
        subprocess.check_call(cmd)
260
120
119
261
121
class DebApplicationManager(ApplicationManagerBase):
120
    def launch_from_app_drawer(self, return_proxy=True):
262
122
    """Application manager for deb based apps on deb based unity8 session."""
121
        """
263
123
122
        Launch app from app drawer.
264
124
    def __init__(self, name):
123
        """
265
125
        super().__init__(name, UNITY8_DEB_CMD_PREFIX, APP_DEB_URL)
124
        # TODO: Implement with app drawer helpers.
266
126
125
        pass
195
127
196
128
class SnapApplicationManager(ApplicationManagerBase):
197
129
    """Application manager for snap based apps on snap based unity8 session."""
198
130
199
131
    def __init__(self, name):
200
132
        super().__init__(name, UNITY8_SNAP_CMD_PREFIX, APP_SNAP_URL)
201
133
202
134
203
135
class SnapOnDebApplicationManager(ApplicationManagerBase):
204
136
    """Application manager for snap based apps on deb based unity8 session."""
205
137
206
138
    def __init__(self, name):
207
139
        super().__init__(name, UNITY8_DEB_CMD_PREFIX, APP_SNAP_URL)
208
140
209
141
210
142
class Application:
211
143
    __metaclass__ = ABCMeta
212
144
213
145
    def __init__(self, app_name, app_id=None, app_snap=None, use_snap=False):
214
146
        """
215
147
        :param app_name: Display name for application.
216
148
        :param app_id: Application id.
217
149
        :param app_snap: Name of application snap.
218
150
        :param use_snap: Use snap version of application even if running from
219
151
                         a deb based unity8 session.
220
152
        """
221
153
        self.app_name = app_name
222
154
        self.app_id = app_id
223
155
        self.app_snap = app_snap
224
156
        self.proxy_object = None
225
157
        self.app_manager = None
226
158
        self.use_snap = use_snap
227
159
228
160
    def _get_application_manager(self):
229
161
        """Get application manager for required application. The type of
230
162
        application used will either be deb or snap based depending on which
231
163
        type of unity8 session is being used. In the case where unity8 is deb
232
164
        based but use_snap property is True, the snap version of app is used.
233
165
        """
234
166
        if self.app_manager is None:
235
167
            if is_unity8_snap():
236
168
                # This is a snap based unity8 session, so must use snap
237
169
                # based application.
238
170
                self.app_manager = SnapApplicationManager(self.app_snap)
239
171
            elif self.use_snap:
240
172
                # This is a deb based unity8 session, but we're requested to
241
173
                # use a snap based application.
242
174
                self.app_manager = SnapOnDebApplicationManager(self.app_snap)
243
175
            else:
244
176
                # This is a deb based unity8 session using deb based
245
177
                # application.
246
178
                self.app_manager = DebApplicationManager(self.app_id)
247
179
248
180
    def launch_from_scope(self, return_proxy=True):
249
181
        """
250
182
        Launch app from apps scope
251
183
        """
252
184
        launch_application_from_apps_scope(self.app_name)
253
185
        if return_proxy:
254
186
            return self.get_proxy_object()
267
187
126
268
188
    def launch_from_launcher(self, return_proxy=True):
127
    def launch_from_launcher(self, return_proxy=True):
269
189
        """Drag out the launcher and tap the application icon to start it."""
128
        """Drag out the launcher and tap the application icon to start it."""
270
@@ -191,33 +130,16 @@
271
191
        if return_proxy:
130
        if return_proxy:
272
192
            return self.get_proxy_object()
131
            return self.get_proxy_object()
273
193
132
293
194
    def launch(self):
133
    @retry(stop_max_delay=3000,
294
195
        self._get_application_manager()
134
           wait_fixed=1000,
276
196
        self.app_manager.launch()
277
197
278
198
    def stop(self):
279
199
        self._get_application_manager()
280
200
        self.app_manager.stop()
281
201
282
202
    def get_pid(self):
283
203
        self._get_application_manager()
284
204
        return self.app_manager.pid()
285
205
286
206
    def is_running(self):
287
207
        self._get_application_manager()
288
208
        return self.app_manager.running()
289
209
290
210
    @retry(stop_max_delay=30000,
291
211
           wait_exponential_multiplier=1000,
292
212
           wait_exponential_max=10000,
295
213
           retry_on_exception=lambda exception: (
135
           retry_on_exception=lambda exception: (
296
214
               isinstance(exception, ProcessSearchError) or
136
               isinstance(exception, ProcessSearchError) or
297
215
               isinstance(exception, processes.PidNotFoundError) or
137
               isinstance(exception, processes.PidNotFoundError) or
298
138
               isinstance(exception, RuntimeError) or
299
216
               isinstance(exception, NoSuchProcess)))
139
               isinstance(exception, NoSuchProcess)))
300
217
    def get_proxy_object(self):
140
    def get_proxy_object(self):
301
218
        if self.proxy_object is None:
141
        if self.proxy_object is None:
304
219
            self.proxy_object = autopilot.get_proxy_object(
142
            self.proxy_object = autopilot.get_proxy_object(int(self.get_pid()))
303
220
                int(self.get_pid()))
305
221
        return self.proxy_object
143
        return self.proxy_object
306
222
144
307
223
    @abstractmethod
145
    @abstractmethod
308
@@ -231,5 +153,56 @@
309
231
            # In this case always return True to ensure all tests can be
153
            # In this case always return True to ensure all tests can be
310
232
            # listed on the host machine.
154
            # listed on the host machine.
311
233
            return True
155
            return True
314
234
        self._get_application_manager()
156
        return self._is_installed()
315
235
        return self.app_manager.installed()
157
316
158
    @abstractmethod
317
159
    def _is_installed(self, app_id):
318
160
        """Return boolean indicating if app is installed."""
319
161
        pass
320
162
321
163
322
164
class Snap(Application):
323
165
324
166
    app_type = 'snap'
325
167
326
168
    def __init__(self, app_name, app_id):
327
169
        super().__init__(app_name, app_id)
328
170
        self.app_rev_id = None
329
171
330
172
    def _get_launch_params(self):
331
173
        """Return required parameters for app launch command."""
332
174
        return 'appid://{n}/{n}/current-user-version'.format(n=self.app_id)
333
175
334
176
    def _get_app_rev_id(self):
335
177
        """Return the application revision ID."""
336
178
        if self.app_rev_id is None:
337
179
            rev = get_snap_revision(self.app_id)
338
180
            self.app_rev_id = '{n}_{n}_{r}'.format(n=self.app_id, r=rev)
339
181
        return self.app_rev_id
340
182
341
183
    def _is_installed(self):
342
184
        """Return boolean indicating if app is installed."""
343
185
        return is_snap_installed(self.app_id)
344
186
345
187
346
188
class Deb(Application):
347
189
348
190
    app_type = 'deb'
349
191
350
192
    def __init__(self, app_name, app_id, package_id=None):
351
193
        super().__init__(app_name, app_id)
352
194
        self.package_id = package_id or app_id
353
195
354
196
    def _get_launch_params(self):
355
197
        """Return required parameters for app launch command."""
356
198
        return 'application:///{n}.desktop'.format(n=self.app_id)
357
199
358
200
    def _get_app_rev_id(self):
359
201
        """Return the application revision ID."""
360
202
        return self.app_id
361
203
362
204
    def _is_installed(self):
363
205
        """Return boolean indicating if app is installed."""
364
206
        output = subprocess.check_output(
365
207
            ['apt-cache', 'policy', self.package_id])
366
208
        return len(output) > 0 and 'Installed: (none)' not in output.decode()
367
236
209
368
=== modified file 'ubuntu_system_tests/helpers/calculator/app.py'
369
--- ubuntu_system_tests/helpers/calculator/app.py	2017-02-09 15:14:56 +0000
370
+++ ubuntu_system_tests/helpers/calculator/app.py	2017-03-14 11:03:55 +0000
371
@@ -18,17 +18,16 @@
372
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
373
19
#
19
#
374
20
20
376
21
from ubuntu_system_tests.helpers.application import Application
21
from ubuntu_system_tests.helpers.application import Snap
377
22
22
378
23
APP_NAME = 'Calculator'
23
APP_NAME = 'Calculator'
379
24
APP_ID = 'ubuntu-calculator-app'
24
APP_ID = 'ubuntu-calculator-app'
384
25
APP_SNAP = 'ubuntu-calculator-app'
25
385
26
26
386
27
27
class Calculator(Snap):
383
28
class Calculator(Application):
387
29
28
388
30
    def __init__(self):
29
    def __init__(self):
390
31
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
30
        super().__init__(APP_NAME, APP_ID)
391
32
31
392
33
    def get_main_view(self):
32
    def get_main_view(self):
393
34
        from ubuntu_system_tests.helpers.calculator import cpo  # NOQA
33
        from ubuntu_system_tests.helpers.calculator import cpo  # NOQA
394
35
34
395
=== modified file 'ubuntu_system_tests/helpers/calculator/config.py'
396
--- ubuntu_system_tests/helpers/calculator/config.py	2017-01-26 13:44:38 +0000
397
+++ ubuntu_system_tests/helpers/calculator/config.py	2017-03-14 11:03:55 +0000
398
@@ -19,9 +19,7 @@
399
19
#
19
#
400
20
import os
20
import os
401
21
from ubuntu_system_tests.helpers import file_system as fs
21
from ubuntu_system_tests.helpers import file_system as fs
405
22
from ubuntu_system_tests.helpers.calculator.app import (
22
from ubuntu_system_tests.helpers.calculator.app import APP_ID
403
23
    APP_SNAP as SNAP_CALCULATOR,
404
24
)
406
25
from ubuntu_system_tests.helpers.configuration import Config
23
from ubuntu_system_tests.helpers.configuration import Config
407
26
from ubuntu_system_tests.helpers.snap import (
24
from ubuntu_system_tests.helpers.snap import (
408
27
    get_snap_revision,
25
    get_snap_revision,
409
@@ -35,9 +33,9 @@
410
35
33
411
36
    def __init__(self):
34
    def __init__(self):
412
37
        if is_unity8_snap():
35
        if is_unity8_snap():
414
38
            rev = get_snap_revision(SNAP_CALCULATOR)
36
            rev = get_snap_revision(APP_ID)
415
39
            conf_dir = fs.get_home_snap_path(
37
            conf_dir = fs.get_home_snap_path(
417
40
                SNAP_CALCULATOR, rev, fs.DIR_CONFIG, fs.DIR_CALCULATOR)
38
                APP_ID, rev, fs.DIR_CONFIG, fs.DIR_CALCULATOR)
418
41
        else:
39
        else:
419
42
            conf_dir = os.path.join(fs.DIR_HOME_CONFIG, fs.DIR_CALCULATOR)
40
            conf_dir = os.path.join(fs.DIR_HOME_CONFIG, fs.DIR_CALCULATOR)
420
43
        self.conf_file_path = os.path.join(conf_dir, CALCULATOR_CONF_FILE)
41
        self.conf_file_path = os.path.join(conf_dir, CALCULATOR_CONF_FILE)
421
44
42
422
=== modified file 'ubuntu_system_tests/helpers/calendar/app.py'
423
--- ubuntu_system_tests/helpers/calendar/app.py	2017-02-08 17:47:07 +0000
424
+++ ubuntu_system_tests/helpers/calendar/app.py	2017-03-14 11:03:55 +0000
425
@@ -18,17 +18,16 @@
426
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
427
19
#
19
#
428
20
20
430
21
from ubuntu_system_tests.helpers.application import Application
21
from ubuntu_system_tests.helpers.application import Snap
431
22
22
432
23
APP_NAME = 'Calendar'
23
APP_NAME = 'Calendar'
433
24
APP_ID = 'ubuntu-calendar-app'
24
APP_ID = 'ubuntu-calendar-app'
438
25
APP_SNAP = 'ubuntu-calendar-app'
25
439
26
26
440
27
27
class Calendar(Snap):
437
28
class Calendar(Application):
441
29
28
442
30
    def __init__(self):
29
    def __init__(self):
444
31
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
30
        super().__init__(APP_NAME, APP_ID)
445
32
31
446
33
    def get_main_view(self):
32
    def get_main_view(self):
447
34
        from ubuntu_system_tests.helpers.clock.cpo import MainView  # NOQA
33
        from ubuntu_system_tests.helpers.clock.cpo import MainView  # NOQA
448
35
34
449
=== modified file 'ubuntu_system_tests/helpers/camera/app.py'
450
--- ubuntu_system_tests/helpers/camera/app.py	2017-02-08 17:47:07 +0000
451
+++ ubuntu_system_tests/helpers/camera/app.py	2017-03-14 11:03:55 +0000
452
@@ -17,17 +17,16 @@
453
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
454
18
#
18
#
455
19
19
457
20
from ubuntu_system_tests.helpers.application import Application
20
from ubuntu_system_tests.helpers.application import Snap
458
21
21
459
22
APP_NAME = 'Camera'
22
APP_NAME = 'Camera'
460
23
APP_ID = 'camera-app'
23
APP_ID = 'camera-app'
465
24
APP_SNAP = 'camera-app'
24
466
25
25
467
26
26
class Camera(Snap):
464
27
class Camera(Application):
468
28
27
469
29
    def __init__(self):
28
    def __init__(self):
471
30
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
29
        super().__init__(APP_NAME, APP_ID)
472
31
30
473
32
    def get_main_view(self):
31
    def get_main_view(self):
474
33
        from ubuntu_system_tests.helpers.camera import cpo  # NOQA
32
        from ubuntu_system_tests.helpers.camera import cpo  # NOQA
475
34
33
476
=== modified file 'ubuntu_system_tests/helpers/clock/app.py'
477
--- ubuntu_system_tests/helpers/clock/app.py	2017-02-08 17:47:07 +0000
478
+++ ubuntu_system_tests/helpers/clock/app.py	2017-03-14 11:03:55 +0000
479
@@ -17,17 +17,16 @@
480
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
481
18
#
18
#
482
19
19
484
20
from ubuntu_system_tests.helpers.application import Application
20
from ubuntu_system_tests.helpers.application import Snap
485
21
21
486
22
APP_NAME = 'Clock'
22
APP_NAME = 'Clock'
487
23
APP_ID = 'ubuntu-clock-app'
23
APP_ID = 'ubuntu-clock-app'
492
24
APP_SNAP = 'ubuntu-clock-app'
24
493
25
25
494
26
26
class Clock(Snap):
491
27
class Clock(Application):
495
28
27
496
29
    def __init__(self):
28
    def __init__(self):
498
30
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
29
        super().__init__(APP_NAME, APP_ID)
499
31
30
500
32
    def get_main_view(self):
31
    def get_main_view(self):
501
33
        from ubuntu_system_tests.helpers.clock.cpo import MainView  # NOQA
32
        from ubuntu_system_tests.helpers.clock.cpo import MainView  # NOQA
502
34
33
503
=== modified file 'ubuntu_system_tests/helpers/dialer_app/app.py'
504
--- ubuntu_system_tests/helpers/dialer_app/app.py	2017-02-08 15:03:35 +0000
505
+++ ubuntu_system_tests/helpers/dialer_app/app.py	2017-03-14 11:03:55 +0000
506
@@ -17,13 +17,13 @@
507
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
508
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
509
19
#
19
#
511
20
from ubuntu_system_tests.helpers.application import Application
20
from ubuntu_system_tests.helpers.application import Snap
512
21
21
513
22
APP_NAME = 'Phone'
22
APP_NAME = 'Phone'
514
23
APP_ID = 'com.ubuntu.dialer'
23
APP_ID = 'com.ubuntu.dialer'
515
24
24
516
25
25
518
26
class Dialer(Application):
26
class Dialer(Snap):
519
27
27
520
28
    def __init__(self):
28
    def __init__(self):
521
29
        super().__init__(APP_NAME, APP_ID)
29
        super().__init__(APP_NAME, APP_ID)
522
30
30
523
=== modified file 'ubuntu_system_tests/helpers/filemanager/app.py'
524
--- ubuntu_system_tests/helpers/filemanager/app.py	2017-02-09 11:43:45 +0000
525
+++ ubuntu_system_tests/helpers/filemanager/app.py	2017-03-14 11:03:55 +0000
526
@@ -18,17 +18,16 @@
527
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
528
19
#
19
#
529
20
20
531
21
from ubuntu_system_tests.helpers.application import Application
21
from ubuntu_system_tests.helpers.application import Snap
532
22
22
533
23
APP_NAME = 'Files'
23
APP_NAME = 'Files'
534
24
APP_ID = 'ubuntu-filemanager-app'
24
APP_ID = 'ubuntu-filemanager-app'
539
25
APP_SNAP = 'ubuntu-filemanager-app'
25
540
26
26
541
27
27
class FileManager(Snap):
538
28
class FileManager(Application):
542
29
28
543
30
    def __init__(self):
29
    def __init__(self):
545
31
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
30
        super().__init__(APP_NAME, APP_ID)
546
32
31
547
33
    def get_main_view(self):
32
    def get_main_view(self):
548
34
        pass
33
        pass
549
35
34
550
=== modified file 'ubuntu_system_tests/helpers/gallery/app.py'
551
--- ubuntu_system_tests/helpers/gallery/app.py	2017-02-08 17:47:07 +0000
552
+++ ubuntu_system_tests/helpers/gallery/app.py	2017-03-14 11:03:55 +0000
553
@@ -20,7 +20,7 @@
554
20
20
555
21
from ubuntu_system_tests.helpers import autopilot
21
from ubuntu_system_tests.helpers import autopilot
556
22
from ubuntu_system_tests.helpers import processes
22
from ubuntu_system_tests.helpers import processes
558
23
from ubuntu_system_tests.helpers.application import Application
23
from ubuntu_system_tests.helpers.application import Snap
559
24
from ubuntu_system_tests.helpers.scopes.apps import (
24
from ubuntu_system_tests.helpers.scopes.apps import (
560
25
    launch_application_from_apps_scope
25
    launch_application_from_apps_scope
561
26
)
26
)
562
@@ -33,19 +33,19 @@
563
33
APP_NAME = 'Gallery'
33
APP_NAME = 'Gallery'
564
34
APP_WIN_ID = 'com.ubuntu.gallery_gallery'
34
APP_WIN_ID = 'com.ubuntu.gallery_gallery'
565
35
APP_CLICK = 'com.ubuntu.gallery'
35
APP_CLICK = 'com.ubuntu.gallery'
566
36
APP_DOMAIN = 'com.ubuntu.gallery'
567
36
APP_ICON_NAME = 'gallery-app.png'
37
APP_ICON_NAME = 'gallery-app.png'
568
37
APP_ID = 'gallery-app'
38
APP_ID = 'gallery-app'
573
38
APP_SNAP = 'gallery-app'
39
574
39
40
575
40
41
class Gallery(Snap):
572
41
class Gallery(Application):
576
42
42
577
43
    def __init__(self):
43
    def __init__(self):
579
44
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
44
        super().__init__(APP_NAME, APP_ID)
580
45
45
581
46
    def get_main_view(self):
46
    def get_main_view(self):
582
47
        from ubuntu_system_tests.helpers.gallery import cpo  # NOQA
47
        from ubuntu_system_tests.helpers.gallery import cpo  # NOQA
584
48
        return self.get_proxy_object().events_view
48
        return self.get_proxy_object().application
585
49
49
586
50
50
587
51
def launch_gallery_app():
51
def launch_gallery_app():
588
52
52
589
=== modified file 'ubuntu_system_tests/helpers/gallery/cpo.py'
590
--- ubuntu_system_tests/helpers/gallery/cpo.py	2016-12-19 18:50:17 +0000
591
+++ ubuntu_system_tests/helpers/gallery/cpo.py	2017-03-14 11:03:55 +0000
592
@@ -22,6 +22,7 @@
593
22
from autopilot.introspection.utilities import sort_by_keys
22
from autopilot.introspection.utilities import sort_by_keys
594
23
from retrying import retry
23
from retrying import retry
595
24
24
596
25
from ubuntu_system_tests.helpers.gallery.app import APP_DOMAIN
597
25
from ubuntu_system_tests.helpers.input_manager import input_manager
26
from ubuntu_system_tests.helpers.input_manager import input_manager
598
26
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.header import Header
27
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.header import Header
599
27
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.common import CustomProxyObjectBase  # NOQA
28
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.common import CustomProxyObjectBase  # NOQA
600
@@ -34,6 +35,19 @@
601
34
APP_PATH_ROOT = b'comubuntugallery'
35
APP_PATH_ROOT = b'comubuntugallery'
602
35
36
603
36
37
604
38
class comubuntugallery(CustomProxyObjectBase):
605
39
606
40
    @classmethod
607
41
    def validate_dbus_object(cls, path, state):
608
42
        return validate_dbus_object(
609
43
            path, state, APP_PATH_ROOT, APP_PATH_ROOT,
610
44
            applicationName=APP_DOMAIN)
611
45
612
46
    @property
613
47
    def application(self):
614
48
        return self.select_single(GalleryApplication, visible=True)
615
49
616
50
617
37
class GalleryApplication(CustomProxyObjectBase):
51
class GalleryApplication(CustomProxyObjectBase):
618
38
52
619
39
    @classmethod
53
    @classmethod
620
40
54
621
=== modified file 'ubuntu_system_tests/helpers/messaging/app.py'
622
--- ubuntu_system_tests/helpers/messaging/app.py	2017-02-08 15:03:35 +0000
623
+++ ubuntu_system_tests/helpers/messaging/app.py	2017-03-14 11:03:55 +0000
624
@@ -17,7 +17,7 @@
625
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
626
18
#
18
#
627
19
19
629
20
from ubuntu_system_tests.helpers.application import Application
20
from ubuntu_system_tests.helpers.application import Snap
630
21
from ubuntu_system_tests.helpers import autopilot
21
from ubuntu_system_tests.helpers import autopilot
631
22
from ubuntu_system_tests.helpers import processes
22
from ubuntu_system_tests.helpers import processes
632
23
from ubuntu_system_tests.helpers.scopes.apps import (
23
from ubuntu_system_tests.helpers.scopes.apps import (
633
@@ -34,7 +34,7 @@
634
34
APP_WIN_ID = 'messaging-app'
34
APP_WIN_ID = 'messaging-app'
635
35
35
636
36
36
638
37
class Messaging(Application):
37
class Messaging(Snap):
639
38
38
640
39
    def __init__(self):
39
    def __init__(self):
641
40
        super().__init__(APP_NAME, APP_ID)
40
        super().__init__(APP_NAME, APP_ID)
642
41
41
643
=== modified file 'ubuntu_system_tests/helpers/snap.py'
644
--- ubuntu_system_tests/helpers/snap.py	2017-01-26 14:06:10 +0000
645
+++ ubuntu_system_tests/helpers/snap.py	2017-03-14 11:03:55 +0000
646
@@ -25,15 +25,29 @@
647
25
SOCK_SNAPD = '/run/snapd.socket'
25
SOCK_SNAPD = '/run/snapd.socket'
648
26
26
649
27
27
650
28
def get_snap_data(snap_name):
651
29
    """Return snap data dictionary or None if not found."""
652
30
    session = requests_unixsocket.Session()
653
31
    path = quote_plus(SOCK_SNAPD)
654
32
    url = 'http+unix://{p}/v2/snaps/{s}'.format(p=path, s=snap_name)
655
33
    response = session.get(url)
656
34
    if not response.ok:
657
35
        return None
658
36
    return json.loads(response.content.decode())['result']
659
37
660
38
661
28
def get_snap_revision(snap_name):
39
def get_snap_revision(snap_name):
662
29
    """Return the revision of the specified snap.
40
    """Return the revision of the specified snap.
663
30
    :param snap_name: Name of the required snap package.
41
    :param snap_name: Name of the required snap package.
664
31
    :return: Revision number as string.
42
    :return: Revision number as string.
665
32
    """
43
    """
673
33
    session = requests_unixsocket.Session()
44
    snap_data = get_snap_data(snap_name)
674
34
    path = quote_plus(SOCK_SNAPD)
45
    if snap_data is None:
675
35
    url = 'http+unix://{p}/v2/snaps/{s}'.format(p=path, s=snap_name)
46
        raise RuntimeError(
676
36
    response = session.get(url)
47
            'Snap {s} not found'.format(s=snap_name))
677
37
    if not response.ok:
48
    return snap_data['revision']
678
38
        raise ConnectionError('Could not query snapd socket: {}'.format(url))
49
679
39
    return json.loads(response.content.decode())['result']['revision']
50
680
51
def is_installed(snap_name):
681
52
    """Return boolean indicating if snap is installed or not."""
682
53
    return bool(get_snap_data(snap_name))
683
40
54
684
=== modified file 'ubuntu_system_tests/helpers/system_settings/app.py'
685
--- ubuntu_system_tests/helpers/system_settings/app.py	2017-03-11 09:35:38 +0000
686
+++ ubuntu_system_tests/helpers/system_settings/app.py	2017-03-14 11:03:55 +0000
687
@@ -19,27 +19,55 @@
688
19
#
19
#
689
20
from ubuntu_system_tests.helpers import autopilot
20
from ubuntu_system_tests.helpers import autopilot
690
21
from ubuntu_system_tests.helpers import processes
21
from ubuntu_system_tests.helpers import processes
692
22
from ubuntu_system_tests.helpers.application import Application
22
from ubuntu_system_tests.helpers.application import (
693
23
    Deb,
694
24
    Snap,
695
25
)
696
23
from ubuntu_system_tests.helpers.processes import get_process_id
26
from ubuntu_system_tests.helpers.processes import get_process_id
697
24
from ubuntu_system_tests.helpers.scopes.apps import (
27
from ubuntu_system_tests.helpers.scopes.apps import (
699
25
    launch_application_from_apps_scope)
28
    launch_application_from_apps_scope
700
29
)
701
26
30
702
27
APP = 'system-settings'
31
APP = 'system-settings'
703
28
APP_NAME = 'System Settings'
32
APP_NAME = 'System Settings'
704
29
APP_WIN_ID = 'ubuntu-system-settings'
33
APP_WIN_ID = 'ubuntu-system-settings'
705
30
APP_ID = 'ubuntu-system-settings'
34
APP_ID = 'ubuntu-system-settings'
718
31
APP_SNAP = 'ubuntu-system-settings'
35
719
32
36
720
33
37
class SystemSettingsDeb(Deb):
721
34
class SystemSettings(Application):
38
722
35
39
    def __init__(self):
723
36
    def __init__(self):
40
        super().__init__(APP_NAME, APP_ID)
724
37
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
41
725
38
42
    def get_main_view(self):
726
39
    def get_main_view(self):
43
        return get_main_view()
727
40
        from ubuntu_system_tests.helpers.system_settings import cpo  # NOQA
44
728
41
        pid = get_process_id(APP)
45
729
42
        return autopilot.get_proxy_object(pid=pid).main_view
46
class SystemSettingsSnap(Snap):
730
47
731
48
    def __init__(self):
732
49
        super().__init__(APP_NAME, APP_ID)
733
50
734
51
    def get_main_view(self):
735
52
        return get_main_view()
736
53
737
54
738
55
def get_main_view():
739
56
    from ubuntu_system_tests.helpers.system_settings import cpo  # NOQA
740
57
    pid = get_process_id(APP)
741
58
    return autopilot.get_proxy_object(pid=pid).main_view
742
59
743
60
744
61
def get_system_settings_app(mode):
745
62
    """Return system settings application class of required type.
746
63
    :param mode: Either 'snap' or 'deb'.
747
64
    :return: Either SystemSettingsDeb or SystemSettingsSnap class reference.
748
65
    """
749
66
    app_modes = {
750
67
        'deb': SystemSettingsDeb,
751
68
        'snap': SystemSettingsSnap
752
69
    }
753
70
    return app_modes[mode]
754
43
71
755
44
72
756
45
def launch_system_settings(shell):
73
def launch_system_settings(shell):
757
46
74
758
=== modified file 'ubuntu_system_tests/helpers/telegram/app.py'
759
--- ubuntu_system_tests/helpers/telegram/app.py	2017-02-08 15:03:35 +0000
760
+++ ubuntu_system_tests/helpers/telegram/app.py	2017-03-14 11:03:55 +0000
761
@@ -16,13 +16,13 @@
762
16
# You should have received a copy of the GNU General Public License
16
# You should have received a copy of the GNU General Public License
763
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
764
18
18
766
19
from ubuntu_system_tests.helpers.application import Application
19
from ubuntu_system_tests.helpers.application import Snap
767
20
20
768
21
APP_NAME = 'Telegram'
21
APP_NAME = 'Telegram'
769
22
APP_ID = 'com.ubuntu.telegram_telegram'
22
APP_ID = 'com.ubuntu.telegram_telegram'
770
23
23
771
24
24
773
25
class Telegram(Application):
25
class Telegram(Snap):
774
26
26
775
27
    def __init__(self):
27
    def __init__(self):
776
28
        super().__init__(APP_NAME, APP_ID)
28
        super().__init__(APP_NAME, APP_ID)
777
29
29
778
=== modified file 'ubuntu_system_tests/helpers/terminal/app.py'
779
--- ubuntu_system_tests/helpers/terminal/app.py	2017-02-09 11:43:45 +0000
780
+++ ubuntu_system_tests/helpers/terminal/app.py	2017-03-14 11:03:55 +0000
781
@@ -18,17 +18,18 @@
782
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
783
19
#
19
#
784
20
20
786
21
from ubuntu_system_tests.helpers.application import Application
21
from ubuntu_system_tests.helpers.application import Deb
787
22
22
788
23
APP_NAME = 'Terminal'
23
APP_NAME = 'Terminal'
794
24
APP_ID = 'ubuntu-terminal-app'
24
APP_ID = 'com.ubuntu.terminal'
795
25
APP_SNAP = 'ubuntu-terminal-app'
25
APP_PACKAGE_ID = 'ubuntu-terminal-app'
796
26
26
797
27
27
798
28
class Terminal(Application):
28
class Terminal(Deb):
799
29
29
800
30
    def __init__(self):
30
    def __init__(self):
802
31
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
31
        super().__init__(APP_NAME, APP_ID, APP_PACKAGE_ID)
803
32
32
804
33
    def get_main_view(self):
33
    def get_main_view(self):
806
34
        pass
34
        from ubuntu_system_tests.helpers.terminal import cpo  # NOQA
807
35
        return self.get_proxy_object().main_view
808
35
36
809
=== added file 'ubuntu_system_tests/helpers/terminal/cpo.py'
810
--- ubuntu_system_tests/helpers/terminal/cpo.py	1970-01-01 00:00:00 +0000
811
+++ ubuntu_system_tests/helpers/terminal/cpo.py	2017-03-14 11:03:55 +0000
812
@@ -0,0 +1,46 @@
813
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
814
2
815
3
# Ubuntu System Tests
816
4
# Copyright (C) 2017 Canonical
817
5
#
818
6
# This program is free software: you can redistribute it and/or modify
819
7
# it under the terms of the GNU General Public License as published by
820
8
# the Free Software Foundation, either version 3 of the License, or
821
9
# (at your option) any later version.
822
10
#
823
11
# This program is distributed in the hope that it will be useful,
824
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
825
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
826
14
# GNU General Public License for more details.
827
15
#
828
16
# You should have received a copy of the GNU General Public License
829
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
830
18
831
19
from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
832
20
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.common import (
833
21
    CustomProxyObjectBase,
834
22
)
835
23
836
24
APP_PATH_ROOT = b'comubuntuterminal'
837
25
838
26
839
27
class comubuntuterminal(CustomProxyObjectBase):
840
28
    """Autopilot helper object for terminal app."""
841
29
842
30
    @classmethod
843
31
    def validate_dbus_object(cls, path, state):
844
32
        return validate_dbus_object(
845
33
            path, state, APP_PATH_ROOT, APP_PATH_ROOT,
846
34
            applicationName='com.ubuntu.terminal')
847
35
848
36
    @property
849
37
    def main_view(self):
850
38
        return self.wait_select_single(MainView)
851
39
852
40
853
41
class MainView(CustomProxyObjectBase):
854
42
855
43
    @classmethod
856
44
    def validate_dbus_object(cls, path, state):
857
45
        return validate_dbus_object(
858
46
            path, state, APP_PATH_ROOT, b'MainView', objectName='terminal')
859
0
47
860
=== modified file 'ubuntu_system_tests/helpers/utils.py'
861
--- ubuntu_system_tests/helpers/utils.py	2017-02-28 10:57:31 +0000
862
+++ ubuntu_system_tests/helpers/utils.py	2017-03-14 11:03:55 +0000
863
@@ -30,7 +30,7 @@
864
30
DUMMY_IMPORT_ERR = ('DummyImportObject being used because try_import failed. '
30
DUMMY_IMPORT_ERR = ('DummyImportObject being used because try_import failed. '
865
31
                    'Check all required dependencies are installed.')
31
                    'Check all required dependencies are installed.')
866
32
32
868
33
is_discovery = None
33
discovery = None
869
34
34
870
35
35
871
36
def try_import(name, package=None):
36
def try_import(name, package=None):
872
@@ -144,16 +144,16 @@
873
144
144
874
145
def is_discovery():
145
def is_discovery():
875
146
    """Return True if being imported during test discovery."""
146
    """Return True if being imported during test discovery."""
878
147
    global is_discovery
147
    global discovery
879
148
    if is_discovery is None:
148
    if discovery is None:
880
149
        stack_trace = stack()
149
        stack_trace = stack()
881
150
        stack_trace.reverse()
150
        stack_trace.reverse()
882
151
        for frame in stack_trace:
151
        for frame in stack_trace:
888
152
            if frame[3] == 'load_test_suite_from_name':
152
            if frame[3] == 'list_tests':
889
153
                is_discovery = True
153
                discovery = True
890
154
                return is_discovery
154
                return discovery
891
155
        is_discovery = False
155
        discovery = False
892
156
    return is_discovery
156
    return discovery
893
157
157
894
158
158
895
159
class AttrDict(dict):
159
class AttrDict(dict):
896
160
160
897
=== modified file 'ubuntu_system_tests/helpers/webbrowser/app.py'
898
--- ubuntu_system_tests/helpers/webbrowser/app.py	2017-02-08 17:02:14 +0000
899
+++ ubuntu_system_tests/helpers/webbrowser/app.py	2017-03-14 11:03:55 +0000
900
@@ -18,17 +18,16 @@
901
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
902
19
#
19
#
903
20
20
905
21
from ubuntu_system_tests.helpers.application import Application
21
from ubuntu_system_tests.helpers.application import Snap
906
22
22
907
23
APP_NAME = 'Browser'
23
APP_NAME = 'Browser'
908
24
APP_ID = 'webbrowser-app'
24
APP_ID = 'webbrowser-app'
913
25
APP_SNAP = 'webbrowser-app'
25
914
26
26
915
27
27
class WebBrowser(Snap):
912
28
class WebBrowser(Application):
916
29
28
917
30
    def __init__(self):
29
    def __init__(self):
919
31
        super().__init__(APP_NAME, APP_ID, APP_SNAP)
30
        super().__init__(APP_NAME, APP_ID)
920
32
31
921
33
    def get_main_view(self):
32
    def get_main_view(self):
922
34
        from ubuntu_system_tests.helpers.webbrowser import cpo  # NOQA
33
        from ubuntu_system_tests.helpers.webbrowser import cpo  # NOQA
923
35
34
924
=== modified file 'ubuntu_system_tests/host/target_setup.py'
925
--- ubuntu_system_tests/host/target_setup.py	2017-02-20 19:49:08 +0000
926
+++ ubuntu_system_tests/host/target_setup.py	2017-03-14 11:03:55 +0000
927
@@ -178,6 +178,17 @@
928
178
                ['apt-get', '-y', '--no-install-recommends', 'install'] +
178
                ['apt-get', '-y', '--no-install-recommends', 'install'] +
929
179
                packages)
179
                packages)
930
180
180
931
181
    def install_snaps(self, snaps):
932
182
        if snaps:
933
183
            self.mount_fs_rw()
934
184
            for snap in snaps:
935
185
                cmd = 'refresh' if self.is_snap_installed(snap) else 'install'
936
186
                subprocess.check_call(
937
187
                    ['snap', cmd, '--devmode', '--edge', snap])
938
188
939
189
    def is_snap_installed(self, snap):
940
190
        return os.path.isdir(os.path.join('/snap', snap))
941
191
942
181
    def are_packages_installed(self, packages):
192
    def are_packages_installed(self, packages):
943
182
        output = subprocess.check_output(['apt-cache', 'policy'] + packages)
193
        output = subprocess.check_output(['apt-cache', 'policy'] + packages)
944
183
        return len(output) > 0 and 'Installed: (none)' not in output.decode()
194
        return len(output) > 0 and 'Installed: (none)' not in output.decode()
945
@@ -206,15 +217,31 @@
946
206
            # In this case we assume running vivid based ubuntu-touch which
217
            # In this case we assume running vivid based ubuntu-touch which
947
207
            # already has unity8 running, so just return.
218
            # already has unity8 running, so just return.
948
208
            return
219
            return
951
209
        if self.config.get('package_type') == 'snap':
220
        self.setup_snapd_https_proxy()
952
210
            # install and setup unity8-snap-session
221
        if self.config.get('unity8_mode') == 'snap':
953
222
            # install unity8-session snap and set as default session
954
211
            self.install_packages(['unity8-session-snap'])
223
            self.install_packages(['unity8-session-snap'])
955
212
            self.setup_snapd_https_proxy()
956
213
            subprocess.check_call(['unity8-snap-install'])
224
            subprocess.check_call(['unity8-snap-install'])
957
214
            session_name = 'unity8-snap'
225
            session_name = 'unity8-snap'
958
215
        else:
226
        else:
961
216
            # install unity8-desktop-session
227
            # install deb based unity8-desktop-session and set as default.
962
217
            self.install_packages(['unity8-desktop-session'])
228
            # also install ubuntu-terminal-app which is tested as deb
963
229
            self.install_packages([
964
230
                'unity8-desktop-session',
965
231
                'ubuntu-terminal-app',
966
232
            ])
967
233
            # Also install applications as snaps, which can also be launched
968
234
            # in a deb based session
969
235
            self.install_snaps([
970
236
                'address-book-app',
971
237
                'camera-app',
972
238
                'gallery-app',
973
239
                'ubuntu-calculator-app',
974
240
                'ubuntu-calendar-app',
975
241
                'ubuntu-clock-app',
976
242
                'ubuntu-filemanager-app',
977
243
                'webbrowser-app',
978
244
            ])
979
218
            session_name = 'unity8'
245
            session_name = 'unity8'
980
219
        self.set_unity8_default_session(session_name)
246
        self.set_unity8_default_session(session_name)
981
220
247
982
221
248
983
=== modified file 'ubuntu_system_tests/host/targets.py'
984
--- ubuntu_system_tests/host/targets.py	2017-03-07 11:20:22 +0000
985
+++ ubuntu_system_tests/host/targets.py	2017-03-14 11:03:55 +0000
986
@@ -183,7 +183,7 @@
987
183
                    'network_ready', 'update_apt', 'verbose']:
183
                    'network_ready', 'update_apt', 'verbose']:
988
184
            config[key] = getattr(args, key, False)
184
            config[key] = getattr(args, key, False)
989
185
        # Add options from config_stack
185
        # Add options from config_stack
991
186
        for key in ['wifi_ssid', 'wifi_password', 'package_type']:
186
        for key in ['wifi_ssid', 'wifi_password', 'unity8_mode']:
992
187
            config[key] = config_stack.get(key)
187
            config[key] = config_stack.get(key)
993
188
        # Add list of required test dependencies
188
        # Add list of required test dependencies
994
189
        config['test_dependencies'] = debian.get_dependencies(
189
        config['test_dependencies'] = debian.get_dependencies(
995
190
190
996
=== modified file 'ubuntu_system_tests/tests/base.py'
997
--- ubuntu_system_tests/tests/base.py	2017-03-09 02:42:26 +0000
998
+++ ubuntu_system_tests/tests/base.py	2017-03-14 11:03:55 +0000
999
@@ -58,10 +58,6 @@
1000
58
    disable_edges_intro,
58
    disable_edges_intro,
1001
59
    setup_unity
59
    setup_unity
1002
60
)
60
)
1003
61
from ubuntu_system_tests.helpers.webapp import (
1004
62
    DEFAULT_WEBVIEW_INSPECTOR_IP,
1005
63
    DEFAULT_WEBVIEW_INSPECTOR_PORT,
1006
64
)
1007
65
61
1008
66
from ubuntu_system_tests.tests.data.definitions import DESKTOP_PLATFORM_NAME
62
from ubuntu_system_tests.tests.data.definitions import DESKTOP_PLATFORM_NAME
1009
67
63
1010
@@ -211,6 +207,10 @@
1011
211
        """ Setup the environment for the webapps. This method has to be
207
        """ Setup the environment for the webapps. This method has to be
1012
212
        called before launch the first web app in the test.
208
        called before launch the first web app in the test.
1013
213
        """
209
        """
1014
210
        from ubuntu_system_tests.helpers.webapp import (
1015
211
            DEFAULT_WEBVIEW_INSPECTOR_IP,
1016
212
            DEFAULT_WEBVIEW_INSPECTOR_PORT,
1017
213
        )
1018
214
        self.useFixture(JobEnvironmentVariable(
214
        self.useFixture(JobEnvironmentVariable(
1019
215
            global_=True,
215
            global_=True,
1020
216
            UBUNTU_WEBVIEW_DEVTOOLS_HOST=DEFAULT_WEBVIEW_INSPECTOR_IP,
216
            UBUNTU_WEBVIEW_DEVTOOLS_HOST=DEFAULT_WEBVIEW_INSPECTOR_IP,
1021
217
217
1022
=== modified file 'ubuntu_system_tests/tests/test_launch_apps.py'
1023
--- ubuntu_system_tests/tests/test_launch_apps.py	2017-02-13 14:05:03 +0000
1024
+++ ubuntu_system_tests/tests/test_launch_apps.py	2017-03-14 11:03:55 +0000
1025
@@ -18,399 +18,124 @@
1026
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
1027
19
#
19
#
1028
20
20
1029
21
import dbus
1030
22
import logging
21
import logging
1047
23
import os
22
1048
24
import pwd
23
from ubuntu_system_tests.common.config import get_device_config_stack
1033
25
import subprocess
1034
26
import tempfile
1035
27
import time
1036
28
1037
29
from autopilot.testcase import AutopilotTestCase
1038
30
from collections import namedtuple
1039
31
from PIL import Image
1040
32
from retrying import retry
1041
33
from testtools.content import (
1042
34
    attach_file,
1043
35
    ContentType,
1044
36
)
1045
37
1046
38
1049
39
from ubuntu_system_tests.helpers.addressbook.app import AddressBook
24
from ubuntu_system_tests.helpers.addressbook.app import AddressBook
1050
40
from ubuntu_system_tests.helpers.calculator.app import Calculator
25
from ubuntu_system_tests.helpers.calculator.app import Calculator
1051
26
from ubuntu_system_tests.helpers.calculator.fixture_setup import (
1052
27
    CalculatorConfigFixture,
1053
28
)
1054
41
from ubuntu_system_tests.helpers.calendar.app import Calendar
29
from ubuntu_system_tests.helpers.calendar.app import Calendar
1055
42
from ubuntu_system_tests.helpers.camera.app import Camera
30
from ubuntu_system_tests.helpers.camera.app import Camera
1056
43
from ubuntu_system_tests.helpers.clock.app import Clock
31
from ubuntu_system_tests.helpers.clock.app import Clock
1057
44
from ubuntu_system_tests.helpers.filemanager.app import FileManager
32
from ubuntu_system_tests.helpers.filemanager.app import FileManager
1058
45
from ubuntu_system_tests.helpers.gallery.app import Gallery
33
from ubuntu_system_tests.helpers.gallery.app import Gallery
1059
46
from ubuntu_system_tests.helpers.terminal.app import Terminal
34
from ubuntu_system_tests.helpers.terminal.app import Terminal
1061
47
from ubuntu_system_tests.helpers.system_settings.app import SystemSettings
35
from ubuntu_system_tests.helpers.system_settings.app import (
1062
36
    get_system_settings_app,
1063
37
)
1064
48
from ubuntu_system_tests.helpers.webbrowser.app import WebBrowser
38
from ubuntu_system_tests.helpers.webbrowser.app import WebBrowser
1086
49
39
from ubuntu_system_tests.tests.base import BaseUbuntuSystemTestCase
1066
50
from ubuntu_system_tests.helpers.calculator.fixture_setup import (
1067
51
    CalculatorConfigFixture,
1068
52
)
1069
53
from ubuntu_system_tests.helpers.images import (
1070
54
    convert_rgba_image,
1071
55
    get_color_count,
1072
56
    get_color_percentage,
1073
57
    _rmsdiff as rmsdiff,
1074
58
)
1075
59
from ubuntu_system_tests.helpers.mir import get_rgba_screenshot
1076
60
1077
61
from ubuntu_system_tests.helpers.unity8.utils import is_unity8_snap
1078
62
1079
63
APP_LAUNCH_TIMEOUT = 30
1080
64
BLACK_THRESHOLD = 17
1081
65
PIXELS_X = '1024'
1082
66
PIXELS_Y = '768'
1083
67
RESOLUTION = '{x}x{y}'.format(x=PIXELS_X, y=PIXELS_Y)
1084
68
1085
69
app_ids = None
1087
70
40
1088
71
logger = logging.getLogger(__name__)
41
logger = logging.getLogger(__name__)
1089
72
logger.setLevel(logging.INFO)
42
logger.setLevel(logging.INFO)
1090
73
43
1284
74
# TODO: Remove these AppInfo definitions when autopilot introspection is
44
1285
75
#       working on snap based session.
45
class AppLaunchBase(BaseUbuntuSystemTestCase):
1093
76
AppInfo = namedtuple('AppInfo', ['app_class', 'color_stats_list'])
1094
77
APP_INFO_ADDRESSBOOK = AppInfo(AddressBook, [(8, 200, 400)])
1095
78
APP_INFO_CAMERA = AppInfo(Camera, [
1096
79
                              (16, 1700, 2000),  # Full screen
1097
80
                              (16, 28000, 31000)])  # Low space warning
1098
81
APP_INFO_GALLERY = AppInfo(Gallery, [(10, 200, 400)])
1099
82
APP_INFO_CALCULATOR = AppInfo(Calculator, [(8, 4400, 4800)])
1100
83
APP_INFO_CALENDAR = AppInfo(Calendar, [(8, 2300, 2700)])
1101
84
APP_INFO_CLOCK = AppInfo(Clock, [
1102
85
                              (8, 300, 600),  # Full screen
1103
86
                              (8, 4000, 4500)])  # Right hand side dock
1104
87
APP_INFO_FILEMANAGER = AppInfo(FileManager, [(8, 1900, 2200)])
1105
88
APP_INFO_TERMINAL = AppInfo(Terminal, [(85, 600, 900)])
1106
89
APP_INFO_WEBBROWSER = AppInfo(WebBrowser, [(8, 2000, 2300)])
1107
90
APP_INFO_SETTINGS = AppInfo(SystemSettings, [
1108
91
                              (5, 200, 600),  # Full screen
1109
92
                              (5, 2100, 2500),  # Left hand side
1110
93
                              (5, 2800, 3100)])  # Left hand side, compacted
1111
94
1112
95
unity8_snap = None
1113
96
1114
97
1115
98
# TODO: Remove and replace with SetupUnity8 fixture when working in snap based
1116
99
#       session.
1117
100
def restart_unity8():
1118
101
    """Restart unity8 process."""
1119
102
    # Ensure unity8 is running in first place
1120
103
    wait_for_unity8_running()
1121
104
    # kill process and check that unity8 restarts by itself
1122
105
    subprocess.check_call(['pkill', 'unity8'])
1123
106
    # Allow screen to go black before waiting for it to run again
1124
107
    time.sleep(10)
1125
108
    wait_for_unity8_running()
1126
109
1127
110
1128
111
def wait_for_unity8_running():
1129
112
    """Wait until unity8 is displaying on screen."""
1130
113
    for c in range(60):
1131
114
        screen = get_screenshot()
1132
115
        black = get_color_percentage(screen, BLACK_THRESHOLD)
1133
116
        count = get_color_count(screen)
1134
117
        logger.info('#### BLACK :: {} :: COLORS :: {}'.format(black, count))
1135
118
        os.remove(screen)
1136
119
        if black < 50 and count > 100:
1137
120
            # Black screen is no longer displayed
1138
121
            return
1139
122
        time.sleep(1)
1140
123
    raise RuntimeError('Unity8 UI is not displayed!')
1141
124
1142
125
1143
126
def get_command(command):
1144
127
    """Return command based on whether unity8 is running from a snap or not.
1145
128
    If it is then prefix command with 'unity8-session', otherwise return
1146
129
    command with no prefix.
1147
130
    """
1148
131
    global unity8_snap
1149
132
    if unity8_snap is None:
1150
133
        unity8_snap = is_unity8_snap()
1151
134
    if unity8_snap:
1152
135
        return 'unity8-session.{}'.format(command)
1153
136
    return command
1154
137
1155
138
1156
139
# TODO: Remove all below screenshot analysis when autopilot introspection
1157
140
#       working on snap based session.
1158
141
def get_screenshot():
1159
142
    """
1160
143
    Take screen shot and return file path of png file
1161
144
    :return: Path of PNG screen image file
1162
145
    """
1163
146
    timestamp = int(time.time())
1164
147
    filename_rgba = 'screenshot-{}.rgba'.format(timestamp)
1165
148
    filename_png = 'screenshot-{}.png'.format(timestamp)
1166
149
    temp_dir = tempfile.gettempdir()
1167
150
    filepath_rgba = os.path.join(temp_dir, filename_rgba)
1168
151
    filepath_png = os.path.join(temp_dir, filename_png)
1169
152
    get_rgba_screenshot(filepath_rgba)
1170
153
    convert_rgba_image(filepath_rgba, filepath_png, RESOLUTION)
1171
154
    # finished with rgba file so delete it
1172
155
    os.remove(filepath_rgba)
1173
156
    return filepath_png
1174
157
1175
158
1176
159
def images_almost_equal(im1, im2):
1177
160
    """ Determine if two images are almost equal or not
1178
161
    :return: True if the images have almost same content, False otherwise
1179
162
    """
1180
163
    try:
1181
164
        difference = rmsdiff(im1, im2)
1182
165
    except ValueError:
1183
166
        logger.info('### Images have no similarity.')
1184
167
        return False
1185
168
    logger.info('### Image difference :: {}'.format(difference))
1186
169
    return difference < 4
1187
170
1188
171
1189
172
def image_files_almost_equal(im1_path, im2_path):
1190
173
    """ Determine if two image files are equal or not.
1191
174
    :param im1_path: File path to first image file.
1192
175
    :param im2_path: File path to second image file.
1193
176
    :return: True if the image files have same content, False otherwise.
1194
177
    """
1195
178
    return images_almost_equal(Image.open(im1_path), Image.open(im2_path))
1196
179
1197
180
1198
181
# TODO: Remove this when Tutorial and SettingsWizard fixtures working.
1199
182
def get_user_account():
1200
183
    for account in sorted(pwd.getpwall(), key=lambda x: x.pw_uid):
1201
184
        if account.pw_uid > 500 and account.pw_dir.startswith('/home/'):
1202
185
            return account
1203
186
1204
187
1205
188
# TODO: Remove this and replace with Tutorial fixture when working.
1206
189
def disable_edges_demo():
1207
190
    # Getting or setting the dbus property must be done from user account,
1208
191
    # so use dbus-send with sudo -u to set the user.
1209
192
    setting_changed = False
1210
193
    user_id = 'User{}'.format(get_user_account().pw_uid)
1211
194
    wait_for_user(user_id)
1212
195
    user_path = '/org/freedesktop/Accounts/{}'.format(user_id)
1213
196
    user_name = get_user_account().pw_name
1214
197
    if get_edge_demo_status(user_name, user_path):
1215
198
        subprocess.check_call([
1216
199
            'sudo', '-u', user_name,
1217
200
            'dbus-send', '--system', '--print-reply',
1218
201
            '--dest=org.freedesktop.Accounts', user_path,
1219
202
            'org.freedesktop.DBus.Properties.Set',
1220
203
            'string:com.canonical.unity.AccountsService',
1221
204
            'string:demo-edges', 'variant:boolean:false'],
1222
205
            stdout=subprocess.DEVNULL)
1223
206
        setting_changed = True
1224
207
    return setting_changed
1225
208
1226
209
1227
210
@retry(wait_fixed=1000,
1228
211
       stop_max_attempt_number=30,
1229
212
       retry_on_exception=lambda e: (
1230
213
            isinstance(e, subprocess.CalledProcessError)))
1231
214
def get_edge_demo_status(user_name, user_path):
1232
215
    """Return edge demo boolean status."""
1233
216
    output = subprocess.check_output([
1234
217
        'sudo', '-u', user_name,
1235
218
        'dbus-send', '--system', '--print-reply',
1236
219
        '--dest=org.freedesktop.Accounts', user_path,
1237
220
        'org.freedesktop.DBus.Properties.Get',
1238
221
        'string:com.canonical.unity.AccountsService',
1239
222
        'string:demo-edges']).decode().strip().split('\n')[-1]
1240
223
    return output.split(' ')[-1] == 'true'
1241
224
1242
225
1243
226
@retry(wait_fixed=1000,
1244
227
       stop_max_attempt_number=30,
1245
228
       retry_on_exception=lambda e: isinstance(e, RuntimeError))
1246
229
def wait_for_user(user_id):
1247
230
    """Wait until user_id object exists under Accounts object."""
1248
231
    bus = dbus.SystemBus()
1249
232
    obj = bus.get_object(
1250
233
        'org.freedesktop.Accounts', '/org/freedesktop/Accounts')
1251
234
    intf = dbus.Interface(obj, 'org.freedesktop.DBus.Introspectable')
1252
235
    if not 'name="{}"'.format(user_id) in intf.Introspect():
1253
236
        raise RuntimeError('User {} does not exist.'.format(user_id))
1254
237
1255
238
1256
239
# TODO: Remove this and replace with SettingsWizard fixture when working.
1257
240
def disable_settings_wizard():
1258
241
    """Disable settings wizard from running on first boot. Return bool
1259
242
    indicating if setting was changed."""
1260
243
    setting_changed = False
1261
244
    base_path = '/home/{}'.format(get_user_account().pw_name)
1262
245
    if is_unity8_snap():
1263
246
        base_path = os.path.join(base_path, 'snap/unity8-session/common')
1264
247
    wizard_file = os.path.join(
1265
248
        base_path, '.config/ubuntu-system-settings/wizard-has-run')
1266
249
    if not os.path.isfile(wizard_file):
1267
250
        wizard_dir = os.path.dirname(wizard_file)
1268
251
        if not os.path.isdir(wizard_dir):
1269
252
            os.makedirs(wizard_dir)
1270
253
        open(wizard_file, 'a').close()
1271
254
        setting_changed = True
1272
255
    return setting_changed
1273
256
1274
257
1275
258
# TODO: Change to BaseUbuntuSystemTestCase when it works on snap based session.
1276
259
class AppLaunchBase(AutopilotTestCase):
1277
260
1278
261
    @classmethod
1279
262
    def setUpClass(cls):
1280
263
        wizard_changed = disable_settings_wizard()
1281
264
        edges_changed = disable_edges_demo()
1282
265
        if wizard_changed or edges_changed:
1283
266
            restart_unity8()
1286
267
46
1287
268
    def setUp(self):
47
    def setUp(self):
1288
269
        super().setUp()
48
        super().setUp()
1289
270
        self.app = None
49
        self.app = None
1293
271
        self.before = None
50
        self.config_stack = get_device_config_stack()
1291
272
        self.after = None
1292
273
        wait_for_unity8_running()
1294
274
51
1295
275
    def tearDown(self):
52
    def tearDown(self):
1296
276
        if self.app:
53
        if self.app:
1304
277
            self.close_app()
54
            self.app.stop()
1298
278
        if self.before and os.path.isfile(self.before):
1299
279
            os.remove(self.before)
1300
280
            self.before = None
1301
281
        if self.after and os.path.isfile(self.after):
1302
282
            os.remove(self.after)
1303
283
            self.after = None
1305
284
        super().tearDown()
55
        super().tearDown()
1306
285
56
1319
286
    def close_app(self):
57
    def check_app_launch(self, app_class, launch_count):
1320
287
        self.app.stop()
58
        self.app = app_class()
1321
288
        time.sleep(10)
59
        if not self.app.is_installed():
1322
289
60
            reason = '{n} not installed as {t}'.format(
1323
290
    def maximise_window(self):
61
                n=self.app.app_id, t=self.app.app_type)
1324
291
        self.keyboard.press_and_release('Ctrl+LeftMeta+Up')
62
            self.app = None
1325
292
        time.sleep(10)
63
            self.skipTest(reason)
1314
293
1315
294
    def check_app_launch(self, app_info, launch_count):
1316
295
        self.app = app_info.app_class()
1317
296
        logger.info('### TESTING APP NAME :: {}'.format(self.app.app_name))
1318
297
        self.maximise_window()
1326
298
        for count in range(1, launch_count + 1):
64
        for count in range(1, launch_count + 1):
1327
299
            logger.info('### APP LAUNCH :: {}'.format(count))
1328
300
            # TODO: Replace all screenshot analysis with introspection when
1329
301
            #       autopilot working on snap based session.
1330
302
            self.before = get_screenshot()
1331
303
            self.attach_screenshot(
1332
304
                self.before, 'before_launched_{}'.format(count))
1333
305
            self.app.launch()
65
            self.app.launch()
1339
306
            time.sleep(10)
66
            self.assertIsNotNone(self.app.get_main_view())
1340
307
            self.maximise_window()
67
            logger.info('App launch {c} successful'.format(c=count))
1336
308
            self.after = get_screenshot()
1337
309
            self.attach_screenshot(
1338
310
                self.after, 'after_launched_{}'.format(count))
1341
311
            if count < launch_count:
68
            if count < launch_count:
1342
312
                # Only close the app here if this is not the last iteration.
69
                # Only close the app here if this is not the last iteration.
1343
313
                # Otherwise it will be closed automatically in tearDown.
70
                # Otherwise it will be closed automatically in tearDown.
1379
314
                self.close_app()
71
                self.app.stop()
1345
315
            black = get_color_percentage(self.after, BLACK_THRESHOLD)
1346
316
            count = get_color_count(self.after)
1347
317
            logger.info(
1348
318
                '### ID {} :: BLACK {} :: COLORS '
1349
319
                '{}'.format(self.app.app_id, black, count, self.before,
1350
320
                            self.after))
1351
321
            self.assertFalse(
1352
322
                image_files_almost_equal(self.before, self.after),
1353
323
                'No difference on screen detected after app launched.')
1354
324
            self.validate_color_stats(app_info, count, black)
1355
325
1356
326
    def validate_color_stats(self, app_info, color_count, black_percent):
1357
327
        exceptions = []
1358
328
        for stats in app_info.color_stats_list:
1359
329
            black_max = stats[0]
1360
330
            colors_min = stats[1]
1361
331
            colors_max = stats[2]
1362
332
            try:
1363
333
                self.assertGreater(color_count, colors_min)
1364
334
                self.assertLess(color_count, colors_max)
1365
335
                self.assertLess(black_percent, black_max)
1366
336
            except AssertionError as e:
1367
337
                exceptions.append(e)
1368
338
            else:
1369
339
                break
1370
340
        if len(exceptions) == len(app_info.color_stats_list):
1371
341
            # An exception was raised for every stats item, which means
1372
342
            # that none of them matched. So raise the first exception here.
1373
343
            raise exceptions[0]
1374
344
1375
345
    def attach_screenshot(self, file_path, name):
1376
346
        attach_file(
1377
347
            self, file_path, name=name,
1378
348
            content_type=ContentType('image', 'png'), buffer_now=True)
1380
349
72
1381
350
73
1382
351
class LaunchAppOnceTestCase(AppLaunchBase):
74
class LaunchAppOnceTestCase(AppLaunchBase):
1383
352
75
1384
353
    def test_launch_addressbook_app(self):
76
    def test_launch_addressbook_app(self):
1386
354
        self.check_app_launch(APP_INFO_ADDRESSBOOK, 1)
77
        self.check_app_launch(AddressBook, 1)
1387
355
78
1388
356
    def test_launch_camera_app(self):
79
    def test_launch_camera_app(self):
1390
357
        self.check_app_launch(APP_INFO_CAMERA, 1)
80
        self.check_app_launch(Camera, 1)
1391
358
81
1392
359
    def test_launch_gallery_app(self):
82
    def test_launch_gallery_app(self):
1394
360
        self.check_app_launch(APP_INFO_GALLERY, 1)
83
        self.check_app_launch(Gallery, 1)
1395
361
84
1396
362
    def test_launch_calculator_app(self):
85
    def test_launch_calculator_app(self):
1397
363
        self.useFixture(CalculatorConfigFixture(first_run=False))
86
        self.useFixture(CalculatorConfigFixture(first_run=False))
1399
364
        self.check_app_launch(APP_INFO_CALCULATOR, 1)
87
        self.check_app_launch(Calculator, 1)
1400
365
88
1401
366
    def test_launch_calendar_app(self):
89
    def test_launch_calendar_app(self):
1403
367
        self.check_app_launch(APP_INFO_CALENDAR, 1)
90
        self.check_app_launch(Calendar, 1)
1404
368
91
1405
369
    def test_launch_clock_app(self):
92
    def test_launch_clock_app(self):
1407
370
        self.check_app_launch(APP_INFO_CLOCK, 1)
93
        self.check_app_launch(Clock, 1)
1408
371
94
1409
372
    def test_launch_filemanager_app(self):
95
    def test_launch_filemanager_app(self):
1411
373
        self.check_app_launch(APP_INFO_FILEMANAGER, 1)
96
        self.check_app_launch(FileManager, 1)
1412
374
97
1413
375
    def test_launch_terminal_app(self):
98
    def test_launch_terminal_app(self):
1415
376
        self.check_app_launch(APP_INFO_TERMINAL, 1)
99
        self.check_app_launch(Terminal, 1)
1416
377
100
1417
378
    def test_launch_webbrowser_app(self):
101
    def test_launch_webbrowser_app(self):
1419
379
        self.check_app_launch(APP_INFO_WEBBROWSER, 1)
102
        self.check_app_launch(WebBrowser, 1)
1420
380
103
1421
381
    def test_launch_systemsettings_app(self):
104
    def test_launch_systemsettings_app(self):
1423
382
        self.check_app_launch(APP_INFO_SETTINGS, 1)
105
        app = get_system_settings_app(self.config_stack.get('unity8_mode'))
1424
106
        self.check_app_launch(app, 1)
1425
383
107
1426
384
108
1427
385
class LaunchAppTwiceTestCase(AppLaunchBase):
109
class LaunchAppTwiceTestCase(AppLaunchBase):
1428
386
110
1429
387
    def test_launch_addressbook_app_twice(self):
111
    def test_launch_addressbook_app_twice(self):
1431
388
        self.check_app_launch(APP_INFO_ADDRESSBOOK, 2)
112
        self.check_app_launch(AddressBook, 2)
1432
389
113
1433
390
    def test_launch_camera_app_twice(self):
114
    def test_launch_camera_app_twice(self):
1435
391
        self.check_app_launch(APP_INFO_CAMERA, 2)
115
        self.check_app_launch(Camera, 2)
1436
392
116
1437
393
    def test_launch_gallery_app_twice(self):
117
    def test_launch_gallery_app_twice(self):
1439
394
        self.check_app_launch(APP_INFO_GALLERY, 2)
118
        self.check_app_launch(Gallery, 2)
1440
395
119
1441
396
    def test_launch_calculator_app_twice(self):
120
    def test_launch_calculator_app_twice(self):
1442
397
        self.useFixture(CalculatorConfigFixture(first_run=False))
121
        self.useFixture(CalculatorConfigFixture(first_run=False))
1444
398
        self.check_app_launch(APP_INFO_CALCULATOR, 2)
122
        self.check_app_launch(Calculator, 2)
1445
399
123
1446
400
    def test_launch_calendar_app_twice(self):
124
    def test_launch_calendar_app_twice(self):
1448
401
        self.check_app_launch(APP_INFO_CALENDAR, 2)
125
        self.check_app_launch(Calendar, 2)
1449
402
126
1450
403
    def test_launch_clock_app_twice(self):
127
    def test_launch_clock_app_twice(self):
1452
404
        self.check_app_launch(APP_INFO_CLOCK, 2)
128
        self.check_app_launch(Clock, 2)
1453
405
129
1454
406
    def test_launch_filemanager_app_twice(self):
130
    def test_launch_filemanager_app_twice(self):
1456
407
        self.check_app_launch(APP_INFO_FILEMANAGER, 2)
131
        self.check_app_launch(FileManager, 2)
1457
408
132
1458
409
    def test_launch_terminal_app_twice(self):
133
    def test_launch_terminal_app_twice(self):
1460
410
        self.check_app_launch(APP_INFO_TERMINAL, 2)
134
        self.check_app_launch(Terminal, 2)
1461
411
135
1462
412
    def test_launch_webbrowser_app_twice(self):
136
    def test_launch_webbrowser_app_twice(self):
1464
413
        self.check_app_launch(APP_INFO_WEBBROWSER, 2)
137
        self.check_app_launch(WebBrowser, 2)
1465
414
138
1466
415
    def test_launch_systemsettings_app_twice(self):
139
    def test_launch_systemsettings_app_twice(self):
1468
416
        self.check_app_launch(APP_INFO_SETTINGS, 2)
140
        app = get_system_settings_app(self.config_stack.get('unity8_mode'))
1469
141
        self.check_app_launch(app, 2)
1470
417
142
1471
=== modified file 'ubuntu_system_tests/tests/test_system_settings.py'
1472
--- ubuntu_system_tests/tests/test_system_settings.py	2017-03-08 01:00:05 +0000
1473
+++ ubuntu_system_tests/tests/test_system_settings.py	2017-03-14 11:03:55 +0000
1474
@@ -20,6 +20,8 @@
1475
20
20
1476
21
from autopilot.matchers import Eventually
21
from autopilot.matchers import Eventually
1477
22
from testtools.matchers import Equals
22
from testtools.matchers import Equals
1478
23
1479
24
from ubuntu_system_tests.common.config import get_device_config_stack
1480
23
from ubuntu_system_tests.helpers.network.utils import turn_on_wifi
25
from ubuntu_system_tests.helpers.network.utils import turn_on_wifi
1481
24
26
1482
25
from ubuntu_system_tests.helpers.indicators.network.cpo import (
27
from ubuntu_system_tests.helpers.indicators.network.cpo import (
1483
@@ -28,7 +30,9 @@
1484
28
from ubuntu_system_tests.helpers import network
30
from ubuntu_system_tests.helpers import network
1485
29
from ubuntu_system_tests.helpers import system_settings
31
from ubuntu_system_tests.helpers import system_settings
1486
30
from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
32
from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
1488
31
from ubuntu_system_tests.helpers.system_settings.app import SystemSettings
33
from ubuntu_system_tests.helpers.system_settings.app import (
1489
34
    get_system_settings_app,
1490
35
)
1491
32
from ubuntu_system_tests.tests import base
36
from ubuntu_system_tests.tests import base
1492
33
37
1493
34
SOUND_SETTINGS_PAGE = 'soundPage'
38
SOUND_SETTINGS_PAGE = 'soundPage'
1494
@@ -76,7 +80,9 @@
1495
76
80
1496
77
    def setUp(self):
81
    def setUp(self):
1497
78
        super().setUp()
82
        super().setUp()
1499
79
        system_settings_app = SystemSettings()
83
        self.config_stack = get_device_config_stack()
1500
84
        system_settings_app = get_system_settings_app(
1501
85
            self.config_stack.get('unity8_mode'))()
1502
80
        system_settings_app.launch()
86
        system_settings_app.launch()
1503
81
        self.system_settings = system_settings_app.get_main_view()
87
        self.system_settings = system_settings_app.get_main_view()
1504
82
88
Status:	Merged
Approved by:	Santiago Baldassin on 2017-03-14
Approved revision:	539
Merged at revision:	514
Proposed branch:	lp:~canonical-platform-qa/ubuntu-system-tests/app-launch-introspect
Merge into:	lp:ubuntu-system-tests
Diff against target:	1503 lines (+396/-572) 25 files modified ubuntu_system_tests/common/config.py (+2/-3) ubuntu_system_tests/helpers/addressbook/app.py (+3/-4) ubuntu_system_tests/helpers/application.py (+115/-142) ubuntu_system_tests/helpers/calculator/app.py (+5/-6) ubuntu_system_tests/helpers/calculator/config.py (+3/-5) ubuntu_system_tests/helpers/calendar/app.py (+5/-6) ubuntu_system_tests/helpers/camera/app.py (+5/-6) ubuntu_system_tests/helpers/clock/app.py (+5/-6) ubuntu_system_tests/helpers/dialer_app/app.py (+2/-2) ubuntu_system_tests/helpers/filemanager/app.py (+5/-6) ubuntu_system_tests/helpers/gallery/app.py (+7/-7) ubuntu_system_tests/helpers/gallery/cpo.py (+14/-0) ubuntu_system_tests/helpers/messaging/app.py (+2/-2) ubuntu_system_tests/helpers/snap.py (+21/-7) ubuntu_system_tests/helpers/system_settings/app.py (+42/-14) ubuntu_system_tests/helpers/telegram/app.py (+2/-2) ubuntu_system_tests/helpers/terminal/app.py (+9/-8) ubuntu_system_tests/helpers/terminal/cpo.py (+46/-0) ubuntu_system_tests/helpers/utils.py (+8/-8) ubuntu_system_tests/helpers/webbrowser/app.py (+5/-6) ubuntu_system_tests/host/target_setup.py (+32/-5) ubuntu_system_tests/host/targets.py (+1/-1) ubuntu_system_tests/tests/base.py (+4/-4) ubuntu_system_tests/tests/test_launch_apps.py (+45/-320) ubuntu_system_tests/tests/test_system_settings.py (+8/-2)
To merge this branch:	bzr merge lp:~canonical-platform-qa/ubuntu-system-tests/app-launch-introspect
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Santiago Baldassin (community)		2017-02-28	Approve on 2017-03-14
platform-qa-bot	continuous-integration		Approve on 2017-03-14
Review via email: mp+318509@code.launchpad.net