autopilot-gtk

Merge lp:~thomir-deactivatedaccount/autopilot-gtk/trunk-fix-deps into lp:autopilot-gtk

  1. trunk-fix-deps
  2. Merge into trunk
Proposed by Thomi Richards
Status: Merged
Approved by: Martin Pitt
Approved revision: 56
Merged at revision: 55
Proposed branch: lp:~thomir-deactivatedaccount/autopilot-gtk/trunk-fix-deps
Merge into: lp:autopilot-gtk
Diff against target: 114 lines (+26/-11)
4 files modified
debian/control (+1/-1)
tests/autopilot/tests/test_actions.py (+18/-7)
tests/autopilot/tests/test_gnome_system_log.py (+1/-2)
tests/autopilot/tests/test_widget_tree.py (+6/-1)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot-gtk/trunk-fix-deps
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Martin Pitt (community) Approve
Review via email: mp+187971@code.launchpad.net

Commit message

Update packaging details so upgrading from 1.3 -> 1.4 is seamless.

Description of the change

Update packaging details so upgrading from 1.3 -> 1.4 is seamless.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

LGTM. I think the dependency is justified, as the module by itself doesn't make much sense.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/64/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-gtk-ci/64/rebuild

review: Needs Fixing (continuous-integration)
lp:~thomir-deactivatedaccount/autopilot-gtk/trunk-fix-deps updated
56. By Thomi Richards

Fix failing autopilot tests.

Revision history for this message
Martin Pitt (pitti) wrote :

Not a big fan of assertThat(... raises), as that needs 4 lines of code where one is enough, but looks correct to me. Thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-amd64-ci/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-armhf-ci/27
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-i386-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-gtk-ci/65/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-09-17 13:46:19 +0000
+++ debian/control 2013-09-27 06:14:33 +0000
@@ -32,7 +32,7 @@
32Pre-Depends: ${misc:Pre-Depends},32Pre-Depends: ${misc:Pre-Depends},
33Depends: ${shlibs:Depends},33Depends: ${shlibs:Depends},
34 ${misc:Depends},34 ${misc:Depends},
35Breaks: python-autopilot (<< 1.4), python3-autopilot (<< 1.4)35 python-autopilot (>= 1.4) | python3-autopilot (>= 1.4),
36Replaces: autopilot-gtk, libautopilot-gtk0, libautopilot-gtk-dev36Replaces: autopilot-gtk, libautopilot-gtk0, libautopilot-gtk-dev
37Conflicts: autopilot-gtk, libautopilot-gtk0, libautopilot-gtk-dev37Conflicts: autopilot-gtk, libautopilot-gtk0, libautopilot-gtk-dev
38Provides: autopilot-gtk, libautopilot-gtk038Provides: autopilot-gtk, libautopilot-gtk0
3939
=== modified file 'tests/autopilot/tests/test_actions.py'
--- tests/autopilot/tests/test_actions.py 2013-06-27 06:52:52 +0000
+++ tests/autopilot/tests/test_actions.py 2013-09-27 06:14:33 +0000
@@ -18,8 +18,9 @@
18import os18import os
1919
20from autopilot.testcase import AutopilotTestCase20from autopilot.testcase import AutopilotTestCase
21from autopilot.introspection.dbus import StateNotFoundError
21from autopilot.matchers import Eventually22from autopilot.matchers import Eventually
22from testtools.matchers import Equals, NotEquals23from testtools.matchers import Equals, NotEquals, raises
2324
24tests_dir = os.path.dirname(os.path.dirname(os.path.dirname(25tests_dir = os.path.dirname(os.path.dirname(os.path.dirname(
25 os.path.realpath(__file__))))26 os.path.realpath(__file__))))
@@ -56,7 +57,10 @@
56 self.assertThat(entry_color.text, Eventually(Equals('red')))57 self.assertThat(entry_color.text, Eventually(Equals('red')))
5758
58 # should not have any dialogs59 # should not have any dialogs
59 self.assertEqual(self.app.select_single('GtkMessageDialog'), None)60 self.assertThat(
61 lambda: self.app.select_single('GtkMessageDialog'),
62 raises(StateNotFoundError)
63 )
6064
61 # focus and activate the "Greet" button65 # focus and activate the "Greet" button
62 self.keyboard.press_and_release('Tab')66 self.keyboard.press_and_release('Tab')
@@ -74,8 +78,10 @@
7478
75 # close the dialog79 # close the dialog
76 self.keyboard.press_and_release('Enter')80 self.keyboard.press_and_release('Enter')
77 self.assertThat(lambda: self.app.select_single('GtkMessageDialog', visible=True),81 self.assertThat(
78 Eventually(Equals(None)))82 lambda: self.app.select_single('GtkMessageDialog', visible=True),
83 raises(StateNotFoundError)
84 )
7985
80 def test_greeting_mouse(self):86 def test_greeting_mouse(self):
81 """Greeting with mouse navigation"""87 """Greeting with mouse navigation"""
@@ -98,7 +104,10 @@
98 self.assertThat(entry_color.text, Eventually(Equals('blue')))104 self.assertThat(entry_color.text, Eventually(Equals('blue')))
99105
100 # should not have any dialogs106 # should not have any dialogs
101 self.assertEqual(self.app.select_single('GtkMessageDialog'), None)107 self.assertThat(
108 lambda: self.app.select_single('GtkMessageDialog'),
109 raises(StateNotFoundError)
110 )
102111
103 # focus and activate the "Greet" button112 # focus and activate the "Greet" button
104 btn = self.app.select_single('GtkButton', label='Greet')113 btn = self.app.select_single('GtkButton', label='Greet')
@@ -118,8 +127,10 @@
118 # close the dialog127 # close the dialog
119 btn = md.select_single('GtkButton', label='gtk-close')128 btn = md.select_single('GtkButton', label='gtk-close')
120 self.mouse.click_object(btn)129 self.mouse.click_object(btn)
121 self.assertThat(lambda: self.app.select_single('GtkMessageDialog', visible=True),130 self.assertThat(
122 Eventually(Equals(None)))131 lambda: self.app.select_single('GtkMessageDialog', visible=True),
132 raises(StateNotFoundError)
133 )
123134
124 def test_clear(self):135 def test_clear(self):
125 """Using Clear button with mouse"""136 """Using Clear button with mouse"""
126137
=== modified file 'tests/autopilot/tests/test_gnome_system_log.py'
--- tests/autopilot/tests/test_gnome_system_log.py 2013-06-27 07:08:37 +0000
+++ tests/autopilot/tests/test_gnome_system_log.py 2013-09-27 06:14:33 +0000
@@ -63,5 +63,4 @@
6363
64 # something that will not be in /etc/issue64 # something that will not be in /etc/issue
65 self.keyboard.type('Bogus12!')65 self.keyboard.type('Bogus12!')
66 self.assertThat(lambda: self.app.select_single('GtkLabel', label=u'No matches found'),66 self.app.wait_select_single('GtkLabel', label=u'No matches found')
67 Eventually(NotEquals(None)))
6867
=== modified file 'tests/autopilot/tests/test_widget_tree.py'
--- tests/autopilot/tests/test_widget_tree.py 2013-08-20 03:07:02 +0000
+++ tests/autopilot/tests/test_widget_tree.py 2013-09-27 06:14:33 +0000
@@ -17,7 +17,9 @@
17import os.path17import os.path
18import unittest18import unittest
1919
20from autopilot.introspection.dbus import StateNotFoundError
20from autopilot.testcase import AutopilotTestCase21from autopilot.testcase import AutopilotTestCase
22from testtools.matchers import raises
2123
22tests_dir = os.path.dirname(os.path.dirname(os.path.dirname(24tests_dir = os.path.dirname(os.path.dirname(os.path.dirname(
23 os.path.realpath(__file__))))25 os.path.realpath(__file__))))
@@ -75,7 +77,10 @@
7577
76 # we have no instances of these78 # we have no instances of these
77 for wtype in ('GtkTable', 'GtkRadioButton'):79 for wtype in ('GtkTable', 'GtkRadioButton'):
78 self.assertIs(self.app.select_single(wtype), None)80 self.assertThat(
81 lambda: self.app.select_single(wtype),
82 raises(StateNotFoundError)
83 )
7984
80 # qualified: visible property is not unique85 # qualified: visible property is not unique
81 self.assertRaises(ValueError,86 self.assertRaises(ValueError,

Subscribers

People subscribed via source and target branches

to all changes: