Merge lp:~rhuddie/gallery-app/dashboard-bug-fix-1419849 into lp:gallery-app

[Richard Huddie]

Fixes for dashboard failures, bug lp:1419849

Fixes for dashboard failures, bug lp:1419849

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1145
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/42
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/128
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/584/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/289
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17896
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/476/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/694
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/694/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~rhuddie/gallery-app/dashboard-bug-fix-1419849]

1146. By Richard Huddie on 2015-02-10

slow down the drag to make it more reliable

1147. By Richard Huddie on 2015-02-10

slow down speed of album page turns to make them more reliable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1146
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/43
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/132
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/590/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/295
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17912
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/482/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/700
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/700/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1147
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/46
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/136
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/594/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/299
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17934
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/485/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/704/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~rhuddie/gallery-app/dashboard-bug-fix-1419849]

1148. By Richard Huddie on 2015-02-11

test_share_button fix, ensure cancel button is visible before pressing

1149. By Richard Huddie on 2015-02-11

merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1148
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/47
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/137
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/596/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/301
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17950
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/487/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/706
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/706/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1149
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/48
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/141
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/600/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/305
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17972
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/488/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/710
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/710/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1149
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/49
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/144
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/610/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/315
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18003
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/495/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/720/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/gallery_app/emulators/album_view.py'
--- tests/autopilot/gallery_app/emulators/album_view.py	2014-09-04 12:27:15 +0000
+++ tests/autopilot/gallery_app/emulators/album_view.py	2015-02-11 11:27:47 +0000
@@ -68,7 +68,8 @@
     def get_plus_icon_empty_album(self):
         """Returns the plus icon visible in empty albums"""
         return self.app.select_single("QQuickImage",
-                                      objectName="addButton", visible=True)
+                                      objectName="albumCoverAddPhotosImage",
+                                      visible=True)
 
     def ensure_animated_fully_closed(self):
         """Ensure the animated album view is fully closed"""
@@ -100,7 +101,7 @@
             self.pointing_device.drag(
                 mid_x, mid_y,  # Start
                 x + w, mid_y,  # Finish
-                rate=3
+                rate=1
             )
 
         elif 'right' == direction:
@@ -108,7 +109,7 @@
             self.pointing_device.drag(
                 mid_x, mid_y,  # Start
                 x, mid_y,      # Finish
-                rate=3
+                rate=1
             )
         else:
             raise GalleryAppException(

=== modified file 'tests/autopilot/gallery_app/emulators/photo_viewer.py'
--- tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-09-16 17:41:40 +0000
+++ tests/autopilot/gallery_app/emulators/photo_viewer.py	2015-02-11 11:27:47 +0000
@@ -32,12 +32,14 @@
     def get_content_peer_picker_cancel_button(self):
         """Returns the ContentPeerPicker cancel button."""
         return self.get_share_peer_picker().wait_select_single("Button",
-                                            objectName="contentPeerPickerCancelButton")
+                                            objectName="contentPeerPickerCancelButton",
+                                            visible=True)
 
     def get_share_peer_picker(self):
         """Returns the photo viewer share picker."""
         return self.app.wait_select_single("ContentPeerPicker10",
-                                           objectName="sharePicker")
+                                           objectName="sharePicker",
+                                           visible=True)
 
     def get_photo_edit_dialog(self):
         """Returns the photo edit dialog."""

=== modified file 'tests/autopilot/gallery_app/tests/test_album_view.py'
--- tests/autopilot/gallery_app/tests/test_album_view.py	2014-09-03 21:13:03 +0000
+++ tests/autopilot/gallery_app/tests/test_album_view.py	2015-02-11 11:27:47 +0000
@@ -185,7 +185,6 @@
         editor.ensure_fully_open()
         editor.close()
 
-        self.open_first_album()
         num_photos_start = self.album_view.number_of_photos()
         self.assertThat(num_photos_start, Equals(0))
 
@@ -197,6 +196,7 @@
         self.click_item(photo)
         self.main_view.get_header().click_action_button("addButton")
 
+        self.open_first_album()
         self.assertThat(
             lambda: self.album_view.number_of_photos(),
             Eventually(Equals(num_photos_start + 1)))

=== modified file 'tests/autopilot/gallery_app/tests/test_albums_view.py'
--- tests/autopilot/gallery_app/tests/test_albums_view.py	2014-10-13 10:31:53 +0000
+++ tests/autopilot/gallery_app/tests/test_albums_view.py	2015-02-11 11:27:47 +0000
@@ -14,7 +14,9 @@
 from autopilot.introspection.dbus import StateNotFoundError
 
 from gallery_app.tests import GalleryTestCase
+from gallery_app.emulators.album_view import AlbumView
 from gallery_app.emulators.albums_view import AlbumsView
+from gallery_app.emulators.media_selector import MediaSelector
 from gallery_app.emulators import album_editor
 
 from os import environ as env
@@ -24,9 +26,17 @@
     envDesktopMode = None
 
     @property
+    def album_view(self):
+        return AlbumView(self.app)
+
+    @property
     def albums_view(self):
         return AlbumsView(self.app)
 
+    @property
+    def media_selector(self):
+        return MediaSelector(self.app)
+
     def setUp(self):
         self.ARGS = []
 
@@ -61,6 +71,14 @@
         """Add one album, and checks if the number of albums went up by one"""
         albums = self.albums_view.number_of_albums_in_albums_view()
         self.main_view.get_header().click_action_button("addButton")
+        # a photo must be added to the album for it to be saved
+        plus = self.album_view.get_plus_icon_empty_album()
+        self.click_item(plus)
+        self.media_selector.ensure_fully_open()
+        photo = self.media_selector.get_second_photo()
+        self.click_item(photo)
+        self.main_view.get_header().click_action_button("addButton")
+
         self.assertThat(
             lambda: self.albums_view.number_of_albums_in_albums_view(),
             Eventually(Equals(albums+1))

=== modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
--- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-09-03 00:14:45 +0000
+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2015-02-11 11:27:47 +0000
@@ -41,8 +41,6 @@
         super(TestPhotoViewerBase, self).setUp()
         self.main_view.switch_to_tab("eventsTab")
         self.open_first_photo()
-        # Need to click on the photo to toggle header
-        self.pointing_device.click()
 
     def open_first_photo(self):
         self.assertThat(
@@ -111,7 +109,6 @@
     @skipIf(model() == 'Desktop', 'Share not supported on desktop')
     def test_share_button(self):
         """Clicking the share button must show the ContentPeerPicker."""
-        photo_viewer = self.photo_viewer.get_main_photo_viewer()
         self.main_view.get_header().click_action_button("shareButton")
         share_picker = self.photo_viewer.get_share_peer_picker()
         self.assertThat(share_picker.visible, Eventually(Equals(True)))
@@ -182,19 +179,19 @@
         x, y, w, h = list.globalRect
         mid_y = y + h // 2
         mid_x = x + w // 2
-        self.pointing_device.drag(mid_x, mid_y, x + 10, mid_y)
+        self.pointing_device.drag(mid_x, mid_y, x + 10, mid_y, rate=5)
 
         self.assertThat(list.moving, Eventually(Equals(False)))
         self.assertThat(list.currentIndex, Eventually(Equals(1)))
 
         # Slide right should get us back to the start
-        self.pointing_device.drag(mid_x, mid_y, x + w - 10, mid_y)
+        self.pointing_device.drag(mid_x, mid_y, x + w - 10, mid_y, rate=5)
 
         self.assertThat(list.moving, Eventually(Equals(False)))
         self.assertThat(list.currentIndex, Eventually(Equals(0)))
 
         # Slide right again shouldn't go anywhere
-        self.pointing_device.drag(mid_x, mid_y, x + w - 10, mid_y)
+        self.pointing_device.drag(mid_x, mid_y, x + w - 10, mid_y, rate=5)
 
         self.assertThat(list.moving, Eventually(Equals(False)))
         self.assertThat(list.currentIndex, Eventually(Equals(0)))

=== modified file 'tests/autopilot/gallery_app/tests/test_picker_mode.py'
--- tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-07-15 09:16:18 +0000
+++ tests/autopilot/gallery_app/tests/test_picker_mode.py	2015-02-11 11:27:47 +0000
@@ -72,7 +72,7 @@
         image_path = 'image://thumbnailer/{}/sample02.jpg'.format(
             self.sample_destination_dir)
         photos_page.click_named_photo(image_path)
-        self.assertTrue(pick_button.enabled)
+        self.assertThat(pick_button.enabled, Eventually(Equals(True)))
         self.picker_view.click_pick_button()
 
     def test_selection_synchronisation(self):