Merge lp:~canonical-platform-qa/ubuntu-system-tests/fix_sd_card into lp:ubuntu-system-tests

[Santiago Baldassin]

Including a refresh method for the photos scope

This merge proposal includes a refresh method to reload the photos scope after copying the pictures to the sd card and it also removes the show all and show less steps since they are not present anymore in the My Photos section

@run_tests: ubuntu_system_tests.tests.test_sdcard.SDCardSystemTest.test_view_photos_from_sdcard

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:458
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/668/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3408
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3408/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3408
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3408/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/ust-ci-krillin/25
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/918/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/668/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

I think we should be able to remove any need for the scope refresh in this test. There is a mediascanner helper which can be used to wait for the mediascanner to complete, before navigating to the photos scope. Also, the first navigation to the scope in the test can be removed, as this was for when the scope setup was manually dismissed, which is not the case any longer. I've given it a quick try using this diff and it seems to work OK: http://pastebin.ubuntu.com/23203473/

A couple of other comments below.

review: Needs Fixing

[lp:~canonical-platform-qa/ubuntu-system-tests/fix_sd_card]

459. By Santiago Baldassin on 2016-09-20

Addressing comments from the reviews

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:459
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/713/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3468/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3468/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/977/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/713/rebuild

review: Needs Fixing (continuous-integration)

[Santiago Baldassin (sbaldassin)]

Thanks Richard. I made the changes that you suggested and replied inline to one of your questions.

[lp:~canonical-platform-qa/ubuntu-system-tests/fix_sd_card]

460. By Santiago Baldassin on 2016-09-20

Merge from trunk

461. By Santiago Baldassin on 2016-09-20

Fixing flake 8 issue

[Richard Huddie (rhuddie)]

Just minor comments

review: Needs Fixing

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:461
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/716/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3471
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3471/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3471
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3471/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/ust-ci-krillin/57
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/981/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/716/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:461
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1077/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/309/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/307/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1698/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1077/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:461
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1094/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/333/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/331/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1804/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1094/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:461
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1123/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/381/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/379/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1865/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1123/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:461
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1129/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/394/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/394/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1887/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1129/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

461. By Santiago Baldassin on 2016-09-20

Fixing flake 8 issue

460. By Santiago Baldassin on 2016-09-20

Merge from trunk

459. By Santiago Baldassin on 2016-09-20

Addressing comments from the reviews

458. By Santiago Baldassin on 2016-09-14

Refreshing the photos scope

=== modified file 'ubuntu_system_tests/helpers/scopes/photos/_cpo.py'
--- ubuntu_system_tests/helpers/scopes/photos/_cpo.py	2016-09-15 08:28:48 +0000
+++ ubuntu_system_tests/helpers/scopes/photos/_cpo.py	2016-09-20 14:57:33 +0000
@@ -130,6 +130,11 @@
             visible=True)
         return label.get_parent('ListViewWithPageHeader')
 
+    def refresh(self):
+        _, _, width, height = self.get_properties()['globalRect']
+        self.pointing_device.drag(width/2, height/2, width/2, height)
+        self.wait_for_processing_to_complete()
+
     def get_header_title(self):
         return self.select_single("DashPageHeader", visible=True).title
 

=== modified file 'ubuntu_system_tests/tests/test_sdcard.py'
--- ubuntu_system_tests/tests/test_sdcard.py	2016-09-13 13:39:56 +0000
+++ ubuntu_system_tests/tests/test_sdcard.py	2016-09-20 14:57:33 +0000
@@ -19,9 +19,11 @@
 
 import os
 import tempfile
+from threading import Event
 from urllib import request
 
 from testtools import skipUnless
+from ubuntu_system_tests.helpers import mediascanner
 
 from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
 from ubuntu_system_tests.helpers.indicators.message import (
@@ -118,12 +120,18 @@
         """ Create several pictures to the sd card that will appear in the
         today category
         """
+        scan_completed = Event()
+        observer = mediascanner.start_mediascanner_observer(
+            scan_completed, number)
+        self.addCleanup(observer.stop)
+
         extension = os.path.splitext(SRC_PICTURE_FILE_1)[1]
         new_file = tempfile.mkstemp(suffix=extension)[1]
 
         images.create_new_image(SRC_PICTURE_FILE_1, new_file)
         self.addCleanup(os.remove, new_file)
         self._copy_pictures(new_file, number)
+        scan_completed.wait()
 
     def _copy_unknown_pictures(self, number):
         """ Copy several pictures to the sd card that will appear in the
@@ -257,30 +265,13 @@
     @skipUnless(scopes.is_scope_included(scopes.SCOPE_ID_PHOTOS), SKIP_REASON)
     def test_view_photos_from_sdcard(self):
         """ Validate pictures stored in the sd card are displayed in the photos
-        scope and the buttons "See all" and "See less" work properly
+        scope and the buttons "Show all" and "Show less" work properly
         """
-
-        # This step is added at the beginning to disable the skip button if
-        # needed, this is done before copying the pictures to the sd card to
-        # see those correctly in the 'my photos' section
-        scopes.go_to_photos_scope()
-
-        # Prerequisite: Copy several pictures to the sd card
-        self._copy_new_pictures(20)
-        self._copy_unknown_pictures(2)
-
+        self._copy_new_pictures(3)
         # Reload scope and go to my photos section
         scope = scopes.go_to_photos_scope()
+
         my_photos = scope.go_to_my_photos()
-
         today = my_photos.get_today_category()
-        # Check all the pictures are displayed clicking on "See all"
-        self.assertTrue(today.is_see_all_displayed())
-        my_photos.see_all(today)
-        self.assertLessEqual(20, len(today.get_pictures_list()))
-        self.assertTrue(today.expanded)
 
-        # Check the pictures section is not expanded clicking on "See less"
-        self.assertTrue(today.is_see_less_displayed())
-        my_photos.see_less(today)
-        self.assertTrue(wait_until(today.is_not_see_less_displayed))
+        self.assertLessEqual(3, len(today.get_pictures_list()))