Merge lp:~schwann/gallery-app/gallery-atest-toolbar-opened into lp:gallery-app

Proposed by Günter Schwann on 2013-08-30
Status: Merged
Approved by: Łukasz Zemczak on 2013-09-03
Approved revision: 834
Merged at revision: 831
Proposed branch: lp:~schwann/gallery-app/gallery-atest-toolbar-opened
Merge into: lp:gallery-app
Diff against target: 25 lines (+2/-2)
2 files modified
debian/control (+1/-1)
tests/autopilot/gallery_app/tests/test_photos_view.py (+1/-1)
To merge this branch: bzr merge lp:~schwann/gallery-app/gallery-atest-toolbar-opened
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2013-09-03
Łukasz Zemczak 2013-08-30 Approve on 2013-08-30
Review via email: mp+183195@code.launchpad.net

Commit message

Fix test for the toolbar using the old active property

Description of the change

Fix test for the toolbar using the old active property

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Łukasz Zemczak (sil2100) wrote :

Looks ok to me. +1

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-08-27 10:59:09 +0000
3+++ debian/control 2013-09-03 06:15:36 +0000
4@@ -38,7 +38,7 @@
5 qtdeclarative5-qtquick2-plugin,
6 qtdeclarative5-qtmultimedia-plugin,
7 qtdeclarative5-ubuntu-ui-toolkit-plugin,
8- qtdeclarative5-ubuntu-ui-extras0.1,
9+ qtdeclarative5-ubuntu-ui-extras0.1 (>= 0.1+13.10.20130829-0ubuntu1),
10 qtdeclarative5-window-plugin,
11 Description: Photo gallery for Ubuntu
12 gallery-app is a photo gallery for the Ubuntu platform.
13
14=== modified file 'tests/autopilot/gallery_app/tests/test_photos_view.py'
15--- tests/autopilot/gallery_app/tests/test_photos_view.py 2013-08-19 13:58:55 +0000
16+++ tests/autopilot/gallery_app/tests/test_photos_view.py 2013-09-03 06:15:36 +0000
17@@ -55,7 +55,7 @@
18 self.main_view.open_toolbar().click_custom_button("cancelButton")
19
20 toolbar = self.main_view.get_toolbar()
21- self.assertThat(toolbar.active, Eventually(Equals(False)))
22+ self.assertThat(toolbar.opened, Eventually(Equals(False)))
23 self.assertFalse(photos_overview.inSelectionMode)
24
25 first_photo = self.photos_view.get_first_photo_in_photos_view()

Subscribers

People subscribed via source and target branches