Merge lp:~chris.gagnon/gallery-app/autopilot-fix-flakyness-and-make-work-on-desktop into lp:gallery-app

[Chris Gagnon]

fix tests on desktop,
fix flaky test,
pep8 fixes,
refactor test to make failures easier to diagnose.

[barry]
  py3 port

[Leo Arias (elopio)]

22 + self.pointing_device = ubuntuuitoolkit.emulators.get_pointing_device()

GalleryUtils already has a pointing_device attribute. You should just call the super __init__()
I would actually prefer not to inherit from something like GalleryUtils, but from an autopilot introspection object, but that probably should be in a later refactor.

35 + def _swipe_setup(self):

Here I don't like that you are adding attributes to the object on a method that's not __init__.
I think it could be clearer something like this:

def swipe_page_left(self, page_number):
    self._swipe_page(page_number, 'left')

def _swipe_page(self, page_number, direction):
    album = self.get_album_view()
    spread = self.get_spread_view()
    album.animationRunning.wait_for(False)

    spread_center_x = spread.globalRect.x + spread.globalRect.w // 2
    spread_center_y = spread.globalRect.y + spread.globalRect.h // 2

    start_x = spread.globalRect.x
    start_y = stop_y = spread_center_y

    if direction == 'left':
        stop_x = spread_center_x
        expected_page_matcher = LessThan
    elif direction == 'right':
        stop_x = spread.globalRect.x
        expected_page_matcher = GreatherThan
    else:
        raise Something.

    self.pointing_device.drag(
        start_x, start_y, stop_x, stop_y)

    album.animationRunning.wait_for(False)
    spread.viewingPage.wait_for(expected_page_matcher(page_number))

88 +class EventsViewException(Exception):

I would prefer if this inherits from a general GalleryAppException. Then you could ignore all the GalleryAppExceptions in some cases.

119 def number_of_photos_in_events(self):
[...]
123 + """Return the number of events"""

I think that docstring is wrong.

514 + def media_view(self):

If you do this as a property, then every time you call it the select_single will be executed. Is there a reason for not doing this on the __init__ like:

self.media_view = self.app.select_single(MediaViewer)

?

In general, this is a big step forward, so +1. I still don't like some things, but they don't come from before your branch.

Like this:

203 + def click_delete_dialog_cancel_button(self):

I don't like it being part of a utils module. There's probably a helper for dialogs on the toolkit, and we should return the dialog object from the method that opens it.

Anyway, thanks a lot for this. It's now a lot more understandable.

[Leo Arias (elopio)]

review: Needs Fixing

[Barry Warsaw (barry)]

This looks great, but why not apply this patch too. Then you'll get the Python 3 port at the same time!

http://paste.ubuntu.com/7369251/

review: Approve

[Leo Arias (elopio)]

review: Approve

[lp:~chris.gagnon/gallery-app/autopilot-fix-flakyness-and-make-work-on-desktop]

961. By Chris Gagnon on 2014-05-02

fix flakyness, pep8 fixes and make work on desktop

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:960
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~chris.gagnon/gallery-app/autopilot-fix-flakyness-and-make-work-on-desktop/+merge/218129/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/gallery-app-ci/822/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/247/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/247/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/113/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5431/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:961
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/824/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/250
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/115
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6711
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5435
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5435/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:960
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/825/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/251
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/117
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5438
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5438/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Barry Warsaw (barry)]

LGTM

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Image testing hit the flaky add_photo test again at image #13:
http://ci.ubuntu.com/smokeng/utopic/touch/mako/13:20140506:20140506/7883/

So as this branch should help with that, please get it merged :)

=== modified file 'debian/control'
--- debian/control	2014-04-14 20:21:26 +0000
+++ debian/control	2014-05-02 17:33:12 +0000
@@ -15,8 +15,8 @@
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
-               python,
-Standards-Version: 3.9.4
+               python3-all,
+Standards-Version: 3.9.5
 # If you don't have commit rights to lp:gallery-app but need to upload
 # packaging changes, just go ahead.  The developers will notice and sync
 # up the code again.
@@ -49,7 +49,8 @@
          libqt5test5,
          ubuntu-ui-toolkit-autopilot,
          unity8-autopilot,
-         python-pkg-resources,
+         python3-pkg-resources,
+         python3-autopilot,
 Description: Autopilot tests for the photo gallery for Ubuntu
  gallery-app is a photo gallery for the Ubuntu platform. This package contains
  autopilot tests for it.

=== modified file 'debian/gallery-app-autopilot.lintian-overrides'
--- debian/gallery-app-autopilot.lintian-overrides	2013-03-27 16:16:52 +0000
+++ debian/gallery-app-autopilot.lintian-overrides	2014-05-02 17:33:12 +0000
@@ -1,1 +1,1 @@
-gallery-app-autopilot: image-file-in-usr-lib usr/lib/python2.7/dist-packages/gallery_app/data/sample.jpg
+gallery-app-autopilot: image-file-in-usr-lib usr/lib/python*/dist-packages/gallery_app/data/sample.jpg

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2013-10-06 23:42:20 +0000
+++ tests/autopilot/CMakeLists.txt	2014-05-02 17:33:12 +0000
@@ -1,6 +1,6 @@
 set(AUTOPILOT_DIR gallery_app)
 
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 if(INSTALL_TESTS)

=== modified file 'tests/autopilot/gallery_app/emulators/album_editor.py'
--- tests/autopilot/gallery_app/emulators/album_editor.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/album_editor.py	2014-05-02 17:33:12 +0000
@@ -15,7 +15,7 @@
         cover_image = self.album_cover_image()
         # click left of the cover
         x, y, w, h = cover_image.globalRect
-        self.pointing_device.move(x - 10, y + (h/2))
+        self.pointing_device.move(x - 10, y + (h // 2))
         # workaround lp:1247698 (get rid of toolbar)
         self.pointing_device.click()
         self.pointing_device.click()

=== modified file 'tests/autopilot/gallery_app/emulators/album_view.py'
--- tests/autopilot/gallery_app/emulators/album_view.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/album_view.py	2014-05-02 17:33:12 +0000
@@ -5,13 +5,19 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-from gallery_utils import GalleryUtils
+from testtools.matchers import GreaterThan, LessThan
+
+from gallery_app.emulators.gallery_utils import(
+    GalleryUtils,
+    GalleryAppException,
+)
 
 
 class AlbumView(GalleryUtils):
     """An emulator class that makes it easy to interact with the gallery app"""
 
     def __init__(self, app):
+        super(AlbumView, self).__init__(self)
         self.app = app
 
     def get_animated_album_view(self):
@@ -66,3 +72,52 @@
         animated_viewer = self.get_animated_album_view()
         animated_viewer.isOpen.wait_for(False)
         animated_viewer.animationRunning.wait_for(False)
+
+    def ensure_media_selector_is_fully_closed(self):
+        """Ensure media selector is fully closed"""
+        loader = self.media_selector_loader()
+        loader.status.wait_for(0)
+
+    def _swipe_setup(self, page_number, direction):
+        self.album = self.get_album_view()
+        self.spread = self.get_spread_view()
+        self.album.animationRunning.wait_for(False)
+
+        x, y, w, h = self.spread.globalRect
+        mid_y = y + h // 2
+        mid_x = x + w // 2
+
+        if 'left' == direction:
+            matcher = LessThan
+            self.pointing_device.drag(
+                mid_x, mid_y,  # Start
+                x + w, mid_y  # Finish
+            )
+
+        elif 'right' == direction:
+            matcher = GreaterThan
+            self.pointing_device.drag(
+                mid_x, mid_y,  # Start
+                x, mid_y  # Finish
+            )
+        else:
+            raise GalleryAppException(
+                'Direction can be "right" or "left" '
+                'you choose "{}"'.format(direction))
+
+        self.album.animationRunning.wait_for(False)
+        self.spread.viewingPage.wait_for(matcher(page_number))
+
+    def swipe_page_left(self, page_number):
+        '''Swipe page to the left
+
+        :param page_number: The starting page number you are swiping from
+        '''
+        self._swipe_setup(page_number, 'left')
+
+    def swipe_page_right(self, page_number):
+        '''Swipe page to the right
+
+        :param page_number: The starting page number you are swiping from
+        '''
+        self._swipe_setup(page_number, 'right')

=== modified file 'tests/autopilot/gallery_app/emulators/albums_view.py'
--- tests/autopilot/gallery_app/emulators/albums_view.py	2013-08-09 10:20:19 +0000
+++ tests/autopilot/gallery_app/emulators/albums_view.py	2014-05-02 17:33:12 +0000
@@ -5,7 +5,7 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-from gallery_utils import GalleryUtils
+from gallery_app.emulators.gallery_utils import GalleryUtils
 
 
 class AlbumsView(GalleryUtils):

=== modified file 'tests/autopilot/gallery_app/emulators/events_view.py'
--- tests/autopilot/gallery_app/emulators/events_view.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/events_view.py	2014-05-02 17:33:12 +0000
@@ -5,37 +5,69 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-from gallery_utils import GalleryUtils
+from gallery_app.emulators.gallery_utils import(
+    GalleryAppException,
+    GalleryUtils
+)
 
 
 class EventsView(GalleryUtils):
 
     def __init__(self, app):
+        super(EventsView, self).__init__(self)
         self.app = app
 
-    def get_first_event(self):
-        """Returns the first event in the event view"""
-        return self.app.select_single("OrganicMediaList",
-                                      objectName="organicEventItem0")
+    def get_event(self, event_number=0):
+        """Return an event in the event view based on index number
+
+        :param event_number: the index number of the organicEventItem to get
+        """
+        return self.app.select_single(
+            'OrganicMediaList',
+            objectName='organicEventItem{}'.format(int(event_number))
+        )
 
     def number_of_events(self):
-        """Returns the number of events in the model behind the event view"""
-        return self.app.select_single("EventsOverview")._eventCount
+        """Return the number of events in the model behind the event view"""
+        return self.app.select_single('EventsOverview')._eventCount
 
     def number_of_photos_in_events(self):
-        """Returns the number of events"""
-        photo_delegates = self.app.select_many("QQuickItem",
-                                               objectName="eventPhoto")
+        """Return the number of photos in events"""
+
+        overview = self.app.select_single('EventsOverview')
+        photo_delegates = overview.select_many(
+            "QQuickItem",
+            objectName="eventPhoto"
+        )
         return len(photo_delegates)
 
     def number_of_photos_in_event(self, event):
-        """Returns the number of photo delgated in an event"""
-        photo_delegates = event.select_many("QQuickItem",
-                                            objectName="eventPhoto")
+        """Return the number of photo delgated in an event"""
+        photo_delegates = event.select_many(objectName='eventPhoto')
         return len(photo_delegates)
 
-    def get_first_image_in_event_view(self):
-        """Returns the first photo of the gallery."""
-        event = self.get_first_event()
-        return event.select_many("OrganicItemInteraction",
-                                 objectName='eventsViewPhoto')[1]
+    def _get_image_in_event_view(self, image_name, event_index_num=0):
+        """Return the photo of the gallery based on image name.
+
+        :param image_name: the name of the photo in the event to return"""
+        event = self.get_event(event_index_num)
+        photos = event.select_many(
+            'QQuickItem',
+            objectName='eventPhoto'
+        )
+        for photo in photos:
+            images = photo.select_many('QQuickImage')
+            for image in images:
+                if str(image.source).endswith(image_name):
+                    return image
+        raise GalleryAppException(
+            'Photo with image name {} could not be found'.format(image_name))
+
+    def click_photo(self, photo_name, event_index_num=0):
+        """Click photo with name and event
+
+        :param photo_name: name of file to click
+        :param event_index_num: index of event to click
+        """
+        photo = self._get_image_in_event_view(photo_name, event_index_num)
+        self.pointing_device.click_object(photo)

=== modified file 'tests/autopilot/gallery_app/emulators/gallery_utils.py'
--- tests/autopilot/gallery_app/emulators/gallery_utils.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/gallery_utils.py	2014-05-02 17:33:12 +0000
@@ -4,10 +4,15 @@
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
+import ubuntuuitoolkit.emulators
 
 from time import sleep
 
 
+class GalleryAppException(Exception):
+    pass
+
+
 class GalleryUtils(object):
     """An emulator class that makes it easy to interact with
        general components of the gallery app."""
@@ -16,6 +21,7 @@
 
     def __init__(self, app):
         self.app = app
+        self.pointing_device = ubuntuuitoolkit.emulators.get_pointing_device()
 
     def select_many_retry(self, object_type, **kwargs):
         """Returns the item that is searched for with app.select_many
@@ -26,7 +32,7 @@
         while len(items) < 1 and tries > 0:
             sleep(self.retry_delay)
             items = self.app.select_many(object_type, **kwargs)
-            tries = tries - 1
+            tries -= 1
         return items
 
     def get_qml_view(self):
@@ -103,3 +109,19 @@
             objectName="albumCoverMenuItem",
             text=text
         )
+
+    def _ensure_delete_dialog_visible(self):
+        delete_dialog = self.get_delete_dialog()
+        delete_dialog.opacity.wait_for(1)
+
+    def _click_dialog_button(self, button):
+        self._ensure_delete_dialog_visible()
+        self.pointing_device.click_object(button)
+
+    def click_delete_dialog_cancel_button(self):
+        button = self.get_delete_dialog_cancel_button()
+        self._click_dialog_button(button)
+
+    def click_delete_dialog_delete_button(self):
+        button = self.get_delete_dialog_delete_button()
+        self._click_dialog_button(button)

=== modified file 'tests/autopilot/gallery_app/emulators/media_selector.py'
--- tests/autopilot/gallery_app/emulators/media_selector.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/media_selector.py	2014-05-02 17:33:12 +0000
@@ -5,7 +5,7 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-from gallery_utils import GalleryUtils
+from gallery_app.emulators.gallery_utils import GalleryUtils
 
 
 class MediaSelector(GalleryUtils):

=== modified file 'tests/autopilot/gallery_app/emulators/media_viewer.py'
--- tests/autopilot/gallery_app/emulators/media_viewer.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/media_viewer.py	2014-05-02 17:33:12 +0000
@@ -11,11 +11,13 @@
 class MediaViewer(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """A class that makes it easy to interact with the media viewer"""
 
-    def __init__(self, *args):
-        super(MediaViewer, self).__init__(*args)
-
     def get_edit_spinner(self):
         return self.select_single(
             "ActivityIndicator",
             objectName="busySpinner"
         )
+
+    def ensure_spinner_not_running(self):
+        """Wait for spinner to stop running"""
+        spinner = self.get_edit_spinner()
+        spinner.running.wait_for(False)

=== modified file 'tests/autopilot/gallery_app/emulators/photo_viewer.py'
--- tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-02-04 17:37:28 +0000
+++ tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-05-02 17:33:12 +0000
@@ -5,12 +5,13 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-from gallery_utils import GalleryUtils
+from gallery_app.emulators.gallery_utils import GalleryUtils
 
 
 class PhotoViewer(GalleryUtils):
 
     def __init__(self, app):
+        super(PhotoViewer, self).__init__(self)
         self.app = app
 
     def get_delete_dialog(self):
@@ -116,3 +117,30 @@
         """Returns the edit preview."""
         return self.app.wait_select_single("EditPreview",
                                            objectName="editPreview")
+
+    def _click_item(self, item):
+        self.pointing_device.click_object(item)
+
+    def click_rotate_item(self):
+        rotate_item = self.get_rotate_menu_item()
+        self._click_item(rotate_item)
+
+    def click_crop_item(self):
+        crop_item = self.get_crop_menu_item()
+        self._click_item(crop_item)
+
+    def click_undo_item(self):
+        undo_item = self.get_undo_menu_item()
+        self._click_item(undo_item)
+
+    def click_redo_item(self):
+        redo_item = self.get_redo_menu_item()
+        self._click_item(redo_item)
+
+    def click_revert_item(self):
+        revert_item = self.get_revert_menu_item()
+        self._click_item(revert_item)
+
+    def click_enhance_item(self):
+        enhance_item = self.get_auto_enhance_menu_item()
+        self._click_item(enhance_item)

=== modified file 'tests/autopilot/gallery_app/emulators/photos_view.py'
--- tests/autopilot/gallery_app/emulators/photos_view.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/photos_view.py	2014-05-02 17:33:12 +0000
@@ -5,7 +5,7 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-from gallery_utils import GalleryUtils
+from gallery_app.emulators.gallery_utils import GalleryUtils
 
 
 class PhotosView(GalleryUtils):

=== modified file 'tests/autopilot/gallery_app/emulators/picker_screen.py'
--- tests/autopilot/gallery_app/emulators/picker_screen.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/emulators/picker_screen.py	2014-04-09 08:19:24 +0000
@@ -31,7 +31,6 @@
     def first_media_in_grid_view(self):
         grid_view = self.grid_view()
         return grid_view.select_many("OrganicItemInteraction")[0]
-<<<<<<< TREE
 
     def _get_named_photo_element(self, photo_name):
         """
@@ -46,5 +45,3 @@
         """Select the named photo from the picker view."""
         photo_element = self._get_named_photo_element(photo_name)
         self.pointing_device.click_object(photo_element)
-=======
->>>>>>> MERGE-SOURCE

=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
--- tests/autopilot/gallery_app/tests/__init__.py	2014-03-31 08:38:45 +0000
+++ tests/autopilot/gallery_app/tests/__init__.py	2014-05-02 17:33:12 +0000
@@ -7,8 +7,8 @@
 
 """gallery autopilot tests."""
 
+import os
 import logging
-import os.path
 import shutil
 import signal
 
@@ -24,7 +24,6 @@
 from gallery_app.emulators.gallery_utils import GalleryUtils
 
 from time import sleep
-from os import remove
 
 logger = logging.getLogger(__name__)
 
@@ -69,6 +68,8 @@
         # in /usr
         if os.path.realpath(__file__).startswith("/usr/"):
             return EnvironmentTypes.installed
+        if model() == 'Desktop':
+            return EnvironmentTypes.installed
         else:
             if os.path.exists(self.local_location):
                 return EnvironmentTypes.local
@@ -144,7 +145,7 @@
         config = os.path.expanduser(
             os.path.join("~", ".config", "gallery-app.conf"))
         if os.path.exists(config):
-            remove(config)
+            os.remove(config)
 
     def setUp(self):
         self.pointing_device = toolkit_emulators.get_pointing_device()
@@ -164,8 +165,8 @@
         self.assertThat(self.gallery_utils.get_qml_view().visible,
                         Eventually(Equals(True)))
         """FIXME somehow on the server gallery sometimes is not fully started
-        for switching to the albums view. Therefore this hack of a second"""
-        sleep(1)
+        for switching to the albums view. Therefore this hack of sleeping"""
+        sleep(2)
 
     def launch_gallery_app(self, env_type):
         if env_type == EnvironmentTypes.installed:

=== modified file 'tests/autopilot/gallery_app/tests/test_album_editor.py'
--- tests/autopilot/gallery_app/tests/test_album_editor.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/tests/test_album_editor.py	2014-05-02 17:33:12 +0000
@@ -8,8 +8,6 @@
 
 """Tests the album editor of the gallery app"""
 
-from __future__ import absolute_import
-
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 

=== modified file 'tests/autopilot/gallery_app/tests/test_album_view.py'
--- tests/autopilot/gallery_app/tests/test_album_view.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/tests/test_album_view.py	2014-05-02 17:33:12 +0000
@@ -8,8 +8,6 @@
 
 """Tests the album view of the gallery app"""
 
-from __future__ import absolute_import
-
 from testtools.matchers import Equals, GreaterThan, LessThan
 from autopilot.matchers import Eventually
 
@@ -42,10 +40,6 @@
         super(TestAlbumView, self).setUp()
         self.switch_to_albums_tab()
 
-    def ensure_media_selector_is_fully_closed(self):
-        loader = self.album_view.media_selector_loader()
-        self.assertThat(loader.status, Eventually(Equals(0)))
-
     def test_album_view_open_photo(self):
         self.main_view.close_toolbar()
         self.open_first_album()
@@ -66,32 +60,20 @@
         self.open_album_at(0)
         self.main_view.close_toolbar()
 
-        album = self.album_view.get_album_view()
         spread = self.album_view.get_spread_view()
 
-        self.assertThat(album.animationRunning, Eventually(Equals(False)))
-        self.assertThat(spread.viewingPage, Eventually(Equals(1)))
-        self.main_view.close_toolbar()
-
-        x, y, w, h = spread.globalRect
-        mid_y = y + h / 2
-        mid_x = x + w / 2
-
         # check that we can page to the cover and back (we check for lesser
         # than 1 because it can either be 0 if we are on a one page spread
         # or -1 if we are on a two page spread, for example on desktop)
-        self.pointing_device.drag(mid_x - mid_x / 2, mid_y, x + w - 10, mid_y)
-        self.album_view.get_animated_album_view()
+        self.album_view.swipe_page_left(1)
         self.assertThat(spread.viewingPage, Eventually(LessThan(1)))
-        self.pointing_device.drag(mid_x + mid_x / 2, mid_y, x + 10, mid_y)
-        self.album_view.get_animated_album_view()
+        self.album_view.swipe_page_right(0)
         self.assertThat(spread.viewingPage, Eventually(Equals(1)))
 
         # drag to next page and check we have flipped away from page 1
         # can't check precisely for page 2 because depending on form factor
         # and orientation we might be displaying two pages at the same time
-        self.pointing_device.drag(mid_x + mid_x / 2, mid_y, x + 10, mid_y)
-        self.assertThat(album.animationRunning, Eventually(Equals(False)))
+        self.album_view.swipe_page_right(1)
         self.assertThat(spread.viewingPage, Eventually(GreaterThan(1)))
 
     def test_add_photo(self):
@@ -105,7 +87,7 @@
         self.media_selector.ensure_fully_open()
 
         self.main_view.get_toolbar().click_custom_button("cancelButton")
-        self.ensure_media_selector_is_fully_closed()
+        self.album_view.ensure_media_selector_is_fully_closed()
 
         num_photos = self.album_view.number_of_photos()
         self.assertThat(num_photos, Equals(num_photos_start))
@@ -122,7 +104,6 @@
             lambda: self.album_view.number_of_photos(),
             Eventually(Equals(num_photos_start + 1)))
 
-    @skip("UnicodeEncodeError: 'ascii' codec can't encode character u'xa2'")
     def test_add_photo_to_new_album(self):
         self.main_view.open_toolbar().click_button("addButton")
         self.ui_update()

=== modified file 'tests/autopilot/gallery_app/tests/test_albums_view.py'
--- tests/autopilot/gallery_app/tests/test_albums_view.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/tests/test_albums_view.py	2014-05-02 17:33:12 +0000
@@ -8,8 +8,6 @@
 
 """Tests the albums view of the gallery app."""
 
-from __future__ import absolute_import
-
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 from autopilot.platform import model
@@ -59,14 +57,18 @@
         )
 
     def test_add_album_and_cancel(self):
-        """Add one album, cancel it and checks if the number of albums does not change"""
+        """Add one album, cancel it and checks if the number of albums does
+        not change
+        """
         albums = self.albums_view.number_of_albums_in_albums_view()
         self.main_view.open_toolbar().click_button("addButton")
         editor = self.app.select_single(album_editor.AlbumEditorAnimated)
         editor.ensure_fully_open()
         self.main_view.get_toolbar().click_custom_button("cancelButton")
-        self.assertThat(lambda: self.albums_view.number_of_albums_in_albums_view(),
-                        Eventually(Equals(albums)))
+        self.assertThat(
+            lambda: self.albums_view.number_of_albums_in_albums_view(),
+            Eventually(Equals(albums))
+        )
 
     # Check if Camera Button is not visible at Desktop mode
     def test_camera_button_visible(self):

=== modified file 'tests/autopilot/gallery_app/tests/test_events_view.py'
--- tests/autopilot/gallery_app/tests/test_events_view.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/tests/test_events_view.py	2014-05-02 17:33:12 +0000
@@ -8,8 +8,6 @@
 
 """Tests for the Gallery App"""
 
-from __future__ import absolute_import
-
 from testtools.matchers import Equals, NotEquals, Is, GreaterThan
 from autopilot.matchers import Eventually
 from autopilot.platform import model
@@ -63,15 +61,6 @@
     def enable_select_mode(self):
         self.main_view.open_toolbar().click_button("selectButton")
 
-    def click_first_photo(self):
-        first_photo = self.events_view.get_first_image_in_event_view()
-        self.click_item(first_photo)
-
-    def assert_delete_dialog_visible(self):
-        delete_dialog = self.gallery_utils.get_delete_dialog()
-
-        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
-
     def test_select_button_cancel(self):
         """Clicking the cancel button after clicking the select button must
            hide the toolbar automatically."""
@@ -87,60 +76,50 @@
         self.assertThat(toolbar.opened, Eventually(Equals(False)))
         self.assertFalse(events_view.inSelectionMode)
 
-        first_photo = self.events_view.get_first_image_in_event_view()
-        self.tap_item(first_photo)
-        self.assertTrue(events_view.inSelectionMode)
-
     def test_delete_a_photo(self):
         """Selecting a photo must make the delete button clickable."""
-        number_of_photos = self.events_view.number_of_photos_in_events()
+        self.assertThat(lambda: exists(self.sample_file),
+                        Eventually(Equals(True)))
+
         self.enable_select_mode()
-        self.click_first_photo()
+        self.events_view.click_photo(self.sample_file)
         self.main_view.open_toolbar().click_button("deleteButton")
-        self.assert_delete_dialog_visible()
+        self.assertThat(self.gallery_utils.delete_dialog_shown,
+                        Eventually(Is(True)))
 
-        cancel_item = self.gallery_utils.get_delete_dialog_cancel_button()
-        self.click_item(cancel_item)
+        self.gallery_utils.click_delete_dialog_cancel_button()
+        self.assertThat(self.gallery_utils.delete_dialog_shown,
+                        Eventually(Is(False)))
 
         self.assertThat(lambda: exists(self.sample_file),
                         Eventually(Equals(True)))
 
-        new_number_of_photos = self.events_view.number_of_photos_in_events()
-        self.assertThat(new_number_of_photos, Equals(number_of_photos))
-
-        self.assertThat(self.gallery_utils.delete_dialog_shown,
-                        Eventually(Is(False)))
-
         self.main_view.open_toolbar().click_button("deleteButton")
-        self.assert_delete_dialog_visible()
+        self.assertThat(self.gallery_utils.delete_dialog_shown,
+                        Eventually(Is(True)))
 
-        delete_item = self.gallery_utils.get_delete_dialog_delete_button()
-        self.click_item(delete_item)
+        self.gallery_utils.click_delete_dialog_delete_button()
         self.assertThat(self.gallery_utils.delete_dialog_shown,
                         Eventually(Is(False)))
 
         self.assertThat(lambda: exists(self.sample_file),
                         Eventually(Equals(False)))
 
-        self.ui_update()
-        new_number_of_photos = self.events_view.number_of_photos_in_events()
-        self.assertThat(new_number_of_photos, Equals(number_of_photos - 1))
-
     def test_adding_a_video(self):
         if model() == "Desktop":
-            first_before = self.events_view.get_first_event()
+            before = self.events_view.get_event(0)
             video_file = "video.mp4"
             shutil.copyfile(self.sample_dir+"/option01/"+video_file,
                             self.sample_destination_dir+"/"+video_file)
             video_file = "video.mkv"
             shutil.copyfile(self.sample_dir+"/option01/"+video_file,
                             self.sample_destination_dir+"/"+video_file)
-            first = self.events_view.get_first_event()
-            self.assertThat(lambda: str(first),
-                            Eventually(NotEquals(str(first_before))))
+            after = self.events_view.get_event(0)
+            self.assertThat(lambda: str(after),
+                            Eventually(NotEquals(str(before))))
             self.assertThat(
-                lambda: self.events_view.number_of_photos_in_event(first),
-                Eventually(Equals(2)))
+                lambda: self.events_view.number_of_photos_in_events(),
+                Eventually(Equals(3)))
 
     # Check if Camera Button is not visible at Desktop mode
     def test_camera_button_visible(self):

=== modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
--- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-05-02 17:33:12 +0000
@@ -8,8 +8,6 @@
 
 """Tests the Photo editor of the gallery app."""
 
-from __future__ import absolute_import
-
 from testtools.matchers import Equals, NotEquals, GreaterThan, Is
 from autopilot.matchers import Eventually
 
@@ -18,7 +16,6 @@
 from gallery_app.emulators.events_view import EventsView
 from gallery_app.tests import GalleryTestCase
 
-from os.path import exists
 import os
 from time import sleep
 import unittest
@@ -45,15 +42,16 @@
         self.main_view.open_toolbar()
 
     def open_first_photo(self):
-        self.assertThat(lambda: self.events_view.number_of_photos_in_events(),
-                        Eventually(GreaterThan(0)))
-        single_photo = self.events_view.get_first_image_in_event_view()
+        self.assertThat(
+            lambda: self.events_view.number_of_photos_in_events(),
+            Eventually(GreaterThan(0))
+        )
 
         # workaround lp:1247698
         # toolbar needs to be gone to click on an image.
         self.main_view.close_toolbar()
 
-        self.click_item(single_photo)
+        self.events_view.click_photo(self.sample_file)
 
         photo_viewer_loader = self.photo_viewer.get_main_photo_viewer_loader()
         self.assertThat(photo_viewer_loader.loaded, Eventually(Equals(True)))
@@ -64,9 +62,6 @@
 
 class TestPhotoViewer(TestPhotoViewerBase):
 
-    def setUp(self):
-        super(TestPhotoViewer, self).setUp()
-
     @unittest.skip("Temporarily disable as it fails in some cases, "
                    "supposedly due to problems with the infrastructure")
     def test_save_state(self):
@@ -132,11 +127,11 @@
         self.click_item(cancel_item)
         self.ensure_closed_delete_dialog()
 
-        self.assertThat(lambda: exists(self.sample_file),
+        self.assertThat(lambda: os.path.exists(self.sample_file),
                         Eventually(Equals(True)))
 
         self.delete_one_picture()
-        self.assertThat(lambda: exists(self.sample_file),
+        self.assertThat(lambda: os.path.exists(self.sample_file),
                         Eventually(Equals(False)))
 
         # Delete all other pictures and make sure the photo viewer closes
@@ -183,8 +178,8 @@
 
         # Slide left should move to the next image
         x, y, w, h = list.globalRect
-        mid_y = y + h / 2
-        mid_x = x + w / 2
+        mid_y = y + h // 2
+        mid_x = x + w // 2
         self.pointing_device.drag(mid_x, mid_y, x + 10, mid_y)
 
         self.assertThat(list.moving, Eventually(Equals(False)))
@@ -208,6 +203,7 @@
     def setUp(self):
         super(TestPhotoEditor, self).setUp()
         self.click_edit_button()
+        self.media_view = self.app.select_single(MediaViewer)
 
     def click_edit_button(self):
         self.main_view.open_toolbar().click_button("editButton")
@@ -215,35 +211,6 @@
         self.assertThat(edit_dialog.visible, (Eventually(Equals(True))))
         self.assertThat(edit_dialog.opacity, (Eventually(Equals(1))))
 
-    def click_rotate_item(self):
-        rotate_item = self.photo_viewer.get_rotate_menu_item()
-        self.click_item(rotate_item)
-
-    def click_crop_item(self):
-        crop_item = self.photo_viewer.get_crop_menu_item()
-        self.click_item(crop_item)
-
-    def click_undo_item(self):
-        undo_item = self.photo_viewer.get_undo_menu_item()
-        self.click_item(undo_item)
-
-    def click_redo_item(self):
-        redo_item = self.photo_viewer.get_redo_menu_item()
-        self.click_item(redo_item)
-
-    def click_revert_item(self):
-        revert_item = self.photo_viewer.get_revert_menu_item()
-        self.click_item(revert_item)
-
-    def click_enhance_item(self):
-        enhance_item = self.photo_viewer.get_auto_enhance_menu_item()
-        self.click_item(enhance_item)
-
-    def ensure_spinner_not_running(self):
-        media_view = self.app.select_single(MediaViewer)
-        spinner = media_view.get_edit_spinner()
-        self.assertThat(spinner.running, Eventually(Equals(False)))
-
     def test_photo_editor_crop(self):
         """Cropping a photo must crop it."""
         old_file_size = os.path.getsize(self.sample_file)
@@ -252,17 +219,17 @@
         item_width = crop_box.width
         item_height = crop_box.height
 
-        self.click_crop_item()
+        self.photo_viewer.click_crop_item()
 
         self.assertThat(crop_box.state, Eventually(Equals("shown")))
         self.assertThat(crop_box.opacity, Eventually(Equals(1)))
 
         crop_corner = self.photo_viewer.get_top_left_crop_corner()
         x, y, h, w = crop_corner.globalRect
-        x = x + w / 2
-        y = y + h / 2
+        x = x + w // 2
+        y = y + h // 2
         self.pointing_device.drag(x, y,
-                                  x + item_width / 2, y + item_height / 2)
+                                  x + item_width // 2, y + item_height // 2)
 
         # wait for animation being finished
         crop_overlay = self.photo_viewer.get_crop_overlay()
@@ -271,7 +238,7 @@
 
         crop_button = self.photo_viewer.get_crop_overlays_crop_icon()
         self.click_item(crop_button)
-        self.ensure_spinner_not_running()
+        self.media_view.ensure_spinner_not_running()
 
         # wait for new photo being set/reloaded, so saving thumbnailing etc.
         # is done
@@ -293,8 +260,8 @@
             return opened_photo.paintedWidth > opened_photo.paintedHeight
         self.assertThat(is_landscape(), Equals(True))
 
-        self.click_rotate_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_rotate_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.assertThat(opened_photo.paintedHeight,
                         Eventually(Equals(item_height)))
@@ -303,8 +270,8 @@
 
         self.main_view.open_toolbar()
         self.click_edit_button()
-        self.click_undo_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_undo_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.assertThat(opened_photo.paintedHeight,
                         Eventually(NotEquals(item_height)))
@@ -313,8 +280,8 @@
 
         self.main_view.open_toolbar()
         self.click_edit_button()
-        self.click_redo_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_redo_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.assertThat(opened_photo.paintedHeight,
                         Eventually(Equals(item_height)))
@@ -323,10 +290,10 @@
 
         self.main_view.open_toolbar()
         self.click_edit_button()
-        self.click_rotate_item()
+        self.photo_viewer.click_rotate_item()
         self.main_view.open_toolbar()
         self.click_edit_button()
-        self.click_revert_item()
+        self.photo_viewer.click_revert_item()
 
         self.assertThat(opened_photo.paintedHeight,
                         Eventually(NotEquals(item_height)))
@@ -348,8 +315,8 @@
         self.assertThat(redo_item.enabled, Eventually(Equals(False)))
         self.assertThat(revert_item.enabled, Eventually(Equals(False)))
 
-        self.click_rotate_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_rotate_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.click_edit_button()
         undo_item = self.photo_viewer.get_undo_menu_item()
@@ -360,8 +327,8 @@
         self.assertThat(redo_item.enabled, Eventually(Equals(False)))
         self.assertThat(revert_item.enabled, Eventually(Equals(True)))
 
-        self.click_undo_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_undo_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.click_edit_button()
         undo_item = self.photo_viewer.get_undo_menu_item()
@@ -372,8 +339,8 @@
         self.assertThat(redo_item.enabled, Eventually(Equals(True)))
         self.assertThat(revert_item.enabled, Eventually(Equals(False)))
 
-        self.click_redo_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_redo_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.click_edit_button()
         undo_item = self.photo_viewer.get_undo_menu_item()
@@ -384,8 +351,8 @@
         self.assertThat(redo_item.enabled, Eventually(Equals(False)))
         self.assertThat(revert_item.enabled, Eventually(Equals(True)))
 
-        self.click_revert_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_revert_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.click_edit_button()
         undo_item = self.photo_viewer.get_undo_menu_item()
@@ -396,8 +363,8 @@
         self.assertThat(redo_item.enabled, Eventually(Equals(False)))
         self.assertThat(revert_item.enabled, Eventually(Equals(False)))
 
-        self.click_enhance_item()
-        self.ensure_spinner_not_running()
+        self.photo_viewer.click_enhance_item()
+        self.media_view.ensure_spinner_not_running()
 
         self.click_edit_button()
 

=== modified file 'tests/autopilot/gallery_app/tests/test_photos_view.py'
--- tests/autopilot/gallery_app/tests/test_photos_view.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/tests/test_photos_view.py	2014-05-02 17:33:12 +0000
@@ -8,8 +8,6 @@
 
 """Tests the Photos view of the gallery app."""
 
-from __future__ import absolute_import
-
 from testtools.matchers import Equals, Is
 from testtools import skipUnless
 from autopilot.matchers import Eventually

=== modified file 'tests/autopilot/gallery_app/tests/test_picker_mode.py'
--- tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-05-02 17:33:11 +0000
+++ tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-05-02 17:33:12 +0000
@@ -8,8 +8,6 @@
 
 """Tests the Photos view of the gallery app."""
 
-from __future__ import absolute_import
-
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
@@ -66,7 +64,6 @@
             Eventually(Equals(False))
         )
 
-<<<<<<< TREE
     def test_pick_named_photo(self):
         """Select a named photo and press Pick button."""
         self.picker_view.switch_to_tab('photosTab')
@@ -81,11 +78,8 @@
         self.assertTrue(pick_button.enabled)
         self.click_item(pick_button)
 
-    @unittest.skip("Temporarily disable as it fails in some cases, supposedly due to problems with the infrastructure")
-=======
     @unittest.skip("Temporarily disable as it fails in some cases, "
                    "supposedly due to problems with the infrastructure")
->>>>>>> MERGE-SOURCE
     def test_selection_synchronisation(self):
         """Checks if the selection is the same for both views"""
         first_events_media = self.picker_view.first_media_in_events_view()