1
=== modified file 'ubuntu_system_tests/helpers/scopes/photos/_cpo.py'
2
--- ubuntu_system_tests/helpers/scopes/photos/_cpo.py	2016-09-15 08:28:48 +0000
3
+++ ubuntu_system_tests/helpers/scopes/photos/_cpo.py	2016-09-20 14:57:33 +0000
4
@@ -130,6 +130,11 @@
5
130
            visible=True)
130
            visible=True)
6
131
        return label.get_parent('ListViewWithPageHeader')
131
        return label.get_parent('ListViewWithPageHeader')
7
132
132
8
133
    def refresh(self):
9
134
        _, _, width, height = self.get_properties()['globalRect']
10
135
        self.pointing_device.drag(width/2, height/2, width/2, height)
11
136
        self.wait_for_processing_to_complete()
12
137
13
133
    def get_header_title(self):
138
    def get_header_title(self):
14
134
        return self.select_single("DashPageHeader", visible=True).title
139
        return self.select_single("DashPageHeader", visible=True).title
15
135
140
16
136
141
17
=== modified file 'ubuntu_system_tests/tests/test_sdcard.py'
18
--- ubuntu_system_tests/tests/test_sdcard.py	2016-09-13 13:39:56 +0000
19
+++ ubuntu_system_tests/tests/test_sdcard.py	2016-09-20 14:57:33 +0000
20
@@ -19,9 +19,11 @@
21
19
19
22
20
import os
20
import os
23
21
import tempfile
21
import tempfile
24
22
from threading import Event
25
22
from urllib import request
23
from urllib import request
26
23
24
27
24
from testtools import skipUnless
25
from testtools import skipUnless
28
26
from ubuntu_system_tests.helpers import mediascanner
29
25
27
30
26
from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
28
from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
31
27
from ubuntu_system_tests.helpers.indicators.message import (
29
from ubuntu_system_tests.helpers.indicators.message import (
32
@@ -118,12 +120,18 @@
33
118
        """ Create several pictures to the sd card that will appear in the
120
        """ Create several pictures to the sd card that will appear in the
34
119
        today category
121
        today category
35
120
        """
122
        """
36
123
        scan_completed = Event()
37
124
        observer = mediascanner.start_mediascanner_observer(
38
125
            scan_completed, number)
39
126
        self.addCleanup(observer.stop)
40
127
41
121
        extension = os.path.splitext(SRC_PICTURE_FILE_1)[1]
128
        extension = os.path.splitext(SRC_PICTURE_FILE_1)[1]
42
122
        new_file = tempfile.mkstemp(suffix=extension)[1]
129
        new_file = tempfile.mkstemp(suffix=extension)[1]
43
123
130
44
124
        images.create_new_image(SRC_PICTURE_FILE_1, new_file)
131
        images.create_new_image(SRC_PICTURE_FILE_1, new_file)
45
125
        self.addCleanup(os.remove, new_file)
132
        self.addCleanup(os.remove, new_file)
46
126
        self._copy_pictures(new_file, number)
133
        self._copy_pictures(new_file, number)
47
134
        scan_completed.wait()
48
127
135
49
128
    def _copy_unknown_pictures(self, number):
136
    def _copy_unknown_pictures(self, number):
50
129
        """ Copy several pictures to the sd card that will appear in the
137
        """ Copy several pictures to the sd card that will appear in the
51
@@ -257,30 +265,13 @@
52
257
    @skipUnless(scopes.is_scope_included(scopes.SCOPE_ID_PHOTOS), SKIP_REASON)
265
    @skipUnless(scopes.is_scope_included(scopes.SCOPE_ID_PHOTOS), SKIP_REASON)
53
258
    def test_view_photos_from_sdcard(self):
266
    def test_view_photos_from_sdcard(self):
54
259
        """ Validate pictures stored in the sd card are displayed in the photos
267
        """ Validate pictures stored in the sd card are displayed in the photos
56
260
        scope and the buttons "See all" and "See less" work properly
268
        scope and the buttons "Show all" and "Show less" work properly
57
261
        """
269
        """
68
262
270
        self._copy_new_pictures(3)
59
263
        # This step is added at the beginning to disable the skip button if
60
264
        # needed, this is done before copying the pictures to the sd card to
61
265
        # see those correctly in the 'my photos' section
62
266
        scopes.go_to_photos_scope()
63
267
64
268
        # Prerequisite: Copy several pictures to the sd card
65
269
        self._copy_new_pictures(20)
66
270
        self._copy_unknown_pictures(2)
67
271
69
272
        # Reload scope and go to my photos section
271
        # Reload scope and go to my photos section
70
273
        scope = scopes.go_to_photos_scope()
272
        scope = scopes.go_to_photos_scope()
71
273
72
274
        my_photos = scope.go_to_my_photos()
274
        my_photos = scope.go_to_my_photos()
73
275
74
276
        today = my_photos.get_today_category()
275
        today = my_photos.get_today_category()
75
277
        # Check all the pictures are displayed clicking on "See all"
76
278
        self.assertTrue(today.is_see_all_displayed())
77
279
        my_photos.see_all(today)
78
280
        self.assertLessEqual(20, len(today.get_pictures_list()))
79
281
        self.assertTrue(today.expanded)
80
282
276
85
283
        # Check the pictures section is not expanded clicking on "See less"
277
        self.assertLessEqual(3, len(today.get_pictures_list()))
82
284
        self.assertTrue(today.is_see_less_displayed())
83
285
        my_photos.see_less(today)
84
286
        self.assertTrue(wait_until(today.is_not_see_less_displayed))
Status:	Work in progress
Proposed branch:	lp:~canonical-platform-qa/ubuntu-system-tests/fix_sd_card
Merge into:	lp:ubuntu-system-tests
Diff against target:	85 lines (+17/-21) 2 files modified ubuntu_system_tests/helpers/scopes/photos/_cpo.py (+5/-0) ubuntu_system_tests/tests/test_sdcard.py (+12/-21)
To merge this branch:	bzr merge lp:~canonical-platform-qa/ubuntu-system-tests/fix_sd_card
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
platform-qa-bot	continuous-integration		Needs Fixing on 2017-02-23
Richard Huddie (community)		2016-09-14	Needs Fixing on 2016-09-20
prod-platform-qa	continuous-integration	2017-02-22	Pending
Review via email: mp+305711@code.launchpad.net
1	=== modified file 'ubuntu_system_tests/helpers/scopes/photos/_cpo.py'
2	--- ubuntu_system_tests/helpers/scopes/photos/_cpo.py 2016-09-15 08:28:48 +0000
3	+++ ubuntu_system_tests/helpers/scopes/photos/_cpo.py 2016-09-20 14:57:33 +0000
4	@@ -130,6 +130,11 @@
5	130	visible=True)	130	visible=True)
6	131	return label.get_parent('ListViewWithPageHeader')	131	return label.get_parent('ListViewWithPageHeader')
7	132		132
8			133	def refresh(self):
9			134	_, _, width, height = self.get_properties()['globalRect']
10			135	self.pointing_device.drag(width/2, height/2, width/2, height)
11			136	self.wait_for_processing_to_complete()
12			137
13	133	def get_header_title(self):	138	def get_header_title(self):
14	134	return self.select_single("DashPageHeader", visible=True).title	139	return self.select_single("DashPageHeader", visible=True).title
15	135		140
16	136		141
17	=== modified file 'ubuntu_system_tests/tests/test_sdcard.py'
18	--- ubuntu_system_tests/tests/test_sdcard.py 2016-09-13 13:39:56 +0000
19	+++ ubuntu_system_tests/tests/test_sdcard.py 2016-09-20 14:57:33 +0000
20	@@ -19,9 +19,11 @@
21	19		19
22	20	import os	20	import os
23	21	import tempfile	21	import tempfile
24			22	from threading import Event
25	22	from urllib import request	23	from urllib import request
26	23		24
27	24	from testtools import skipUnless	25	from testtools import skipUnless
28			26	from ubuntu_system_tests.helpers import mediascanner
29	25		27
30	26	from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory	28	from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
31	27	from ubuntu_system_tests.helpers.indicators.message import (	29	from ubuntu_system_tests.helpers.indicators.message import (
32	@@ -118,12 +120,18 @@
33	118	""" Create several pictures to the sd card that will appear in the	120	""" Create several pictures to the sd card that will appear in the
34	119	today category	121	today category
35	120	"""	122	"""
36			123	scan_completed = Event()
37			124	observer = mediascanner.start_mediascanner_observer(
38			125	scan_completed, number)
39			126	self.addCleanup(observer.stop)
40			127
41	121	extension = os.path.splitext(SRC_PICTURE_FILE_1)[1]	128	extension = os.path.splitext(SRC_PICTURE_FILE_1)[1]
42	122	new_file = tempfile.mkstemp(suffix=extension)[1]	129	new_file = tempfile.mkstemp(suffix=extension)[1]
43	123		130
44	124	images.create_new_image(SRC_PICTURE_FILE_1, new_file)	131	images.create_new_image(SRC_PICTURE_FILE_1, new_file)
45	125	self.addCleanup(os.remove, new_file)	132	self.addCleanup(os.remove, new_file)
46	126	self._copy_pictures(new_file, number)	133	self._copy_pictures(new_file, number)
47			134	scan_completed.wait()
48	127		135
49	128	def _copy_unknown_pictures(self, number):	136	def _copy_unknown_pictures(self, number):
50	129	""" Copy several pictures to the sd card that will appear in the	137	""" Copy several pictures to the sd card that will appear in the
51	@@ -257,30 +265,13 @@
52	257	@skipUnless(scopes.is_scope_included(scopes.SCOPE_ID_PHOTOS), SKIP_REASON)	265	@skipUnless(scopes.is_scope_included(scopes.SCOPE_ID_PHOTOS), SKIP_REASON)
53	258	def test_view_photos_from_sdcard(self):	266	def test_view_photos_from_sdcard(self):
54	259	""" Validate pictures stored in the sd card are displayed in the photos	267	""" Validate pictures stored in the sd card are displayed in the photos
56	260	scope and the buttons "See all" and "See less" work properly	268	scope and the buttons "Show all" and "Show less" work properly
57	261	"""	269	"""
68	262		270	self._copy_new_pictures(3)
59	263	# This step is added at the beginning to disable the skip button if
60	264	# needed, this is done before copying the pictures to the sd card to
61	265	# see those correctly in the 'my photos' section
62	266	scopes.go_to_photos_scope()
63	267
64	268	# Prerequisite: Copy several pictures to the sd card
65	269	self._copy_new_pictures(20)
66	270	self._copy_unknown_pictures(2)
67	271
69	272	# Reload scope and go to my photos section	271	# Reload scope and go to my photos section
70	273	scope = scopes.go_to_photos_scope()	272	scope = scopes.go_to_photos_scope()
71			273
72	274	my_photos = scope.go_to_my_photos()	274	my_photos = scope.go_to_my_photos()
73	275
74	276	today = my_photos.get_today_category()	275	today = my_photos.get_today_category()
75	277	# Check all the pictures are displayed clicking on "See all"
76	278	self.assertTrue(today.is_see_all_displayed())
77	279	my_photos.see_all(today)
78	280	self.assertLessEqual(20, len(today.get_pictures_list()))
79	281	self.assertTrue(today.expanded)
80	282		276
85	283	# Check the pictures section is not expanded clicking on "See less"	277	self.assertLessEqual(3, len(today.get_pictures_list()))
82	284	self.assertTrue(today.is_see_less_displayed())
83	285	my_photos.see_less(today)
84	286	self.assertTrue(wait_until(today.is_not_see_less_displayed))