Merge lp:~jonas-drange/ubuntu-system-settings/fix-background-test into lp:ubuntu-system-settings

[Jonas G. Drange]

[background] fix test by being less specific about what image to choose as new background

[background] fix test by being less specific about what image to choose as new background

[Sebastien Bacher (seb128)]

looks fine, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1281
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1945/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/215
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/949
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1068
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1068/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17598

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1945/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

in fact from CI result, that needs work :-/

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

Can't reproduce that failure on mako, desktop or krillin. The good news is that the assertEqual failure is not the issue here.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1281
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1948/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/218
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1083
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1083/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17631

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1948/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1281. By Jonas G. Drange on 2015-01-29

fix test by not being specific which background we click, since that is broken

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_background.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_background.py	2014-12-02 06:40:54 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_background.py	2015-01-29 10:27:22 +0000
@@ -29,7 +29,8 @@
     def get_wallpapergrid(self, name):
         """Return a WallpaperGrid with given name, or
         all of them"""
-        return self.select_single('WallpaperGrid', objectName=name)
+        return self.main_view.wait_select_single(
+            'WallpaperGrid', objectName=name)
 
     def get_wallpapers(self, name=None):
         """Return individual wallpapers (QQuickImage) in given grid,
@@ -77,16 +78,17 @@
 
         # wallpaper source that is selected now
         old = self.selected_wallpaper.source
-
-        # click a wallpaper that is not selected
-        self.main_view.scroll_to_and_click(
-            self.all_wallpapers[3])
-
-        # click set/save
-        self.save_wallpaper()
-
-        # the newly selected wallpaper source
-        new = self.selected_wallpaper.source
+        new = None
+
+        # Grid elements are produced by a repeater, and AP cannot
+        # AFAIK select specific children. We therefor click backgrounds
+        # until the selected wallpaper changes
+        for wp in self.get_wallpapers(name='UbuntuArtGrid'):
+            self.main_view.pointing_device.click_object(wp)
+            self.save_wallpaper()
+            new = self.selected_wallpaper.source
+            if old != new:
+                break
 
         # assert that UI is updated
         self.assertNotEqual(new, old)