Bazaar GTK+ Frontends

Merge lp:~jelmer/bzr-gtk/fix-tests into lp:bzr-gtk

  1. fix-tests
  2. Merge into gtk3
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 797
Proposed branch: lp:~jelmer/bzr-gtk/fix-tests
Merge into: lp:bzr-gtk
Diff against target: 113 lines (+17/-12)
5 files modified
__init__.py (+2/-0)
commit.py (+1/-1)
diff.py (+3/-0)
tests/test_ui.py (+10/-10)
ui.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr-gtk/fix-tests
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Bazaar GTK maintainers Pending
Review via email: mp+311894@code.launchpad.net

Description of the change

Fix tests on modern Debian systems.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Indeed, on xenial which I'm using right now,

$ bzr selftest -s bp.gtk

fails on trunk but succeeds with your patch so, approving, thanks !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '__init__.py'
--- __init__.py 2012-03-16 17:28:20 +0000
+++ __init__.py 2016-11-27 17:35:27 +0000
@@ -164,6 +164,8 @@
164 try:164 try:
165 result = basic_tests165 result = basic_tests
166 try:166 try:
167 import gi
168 gi.require_version('Gtk', '3.0')
167 import gi.repository.Gtk169 import gi.repository.Gtk
168 except ImportError:170 except ImportError:
169 return basic_tests171 return basic_tests
170172
=== modified file 'commit.py'
--- commit.py 2012-03-22 17:14:22 +0000
+++ commit.py 2016-11-27 17:35:27 +0000
@@ -37,7 +37,7 @@
3737
38try:38try:
39 import dbus39 import dbus
40 import dbus.glib40 import dbus.mainloop.glib
41 have_dbus = True41 have_dbus = True
42except ImportError:42except ImportError:
43 have_dbus = False43 have_dbus = False
4444
=== modified file 'diff.py'
--- diff.py 2012-02-05 05:14:11 +0000
+++ diff.py 2016-11-27 17:35:27 +0000
@@ -13,6 +13,9 @@
13import sys13import sys
14import inspect14import inspect
1515
16import gi
17gi.require_version('Gtk', '3.0')
18gi.require_version('GtkSource', '3.0')
16from gi.repository import Gtk19from gi.repository import Gtk
17from gi.repository import Pango20from gi.repository import Pango
18try:21try:
1922
=== modified file 'tests/test_ui.py'
--- tests/test_ui.py 2012-02-28 04:53:55 +0000
+++ tests/test_ui.py 2016-11-27 17:35:27 +0000
@@ -61,8 +61,8 @@
61 self.assertEqual('test 123', dialog.props.text)61 self.assertEqual('test 123', dialog.props.text)
62 self.assertEqual(Gtk.MessageType.QUESTION, dialog.props.message_type)62 self.assertEqual(Gtk.MessageType.QUESTION, dialog.props.message_type)
63 buttons = dialog.get_action_area().get_children()63 buttons = dialog.get_action_area().get_children()
64 self.assertEqual('gtk-yes', buttons[0].props.label)64 self.assertEqual('_No', buttons[0].props.label)
65 self.assertEqual('gtk-no', buttons[1].props.label)65 self.assertEqual('_Yes', buttons[1].props.label)
6666
6767
68class InfoDialogTestCase(tests.TestCase):68class InfoDialogTestCase(tests.TestCase):
@@ -73,7 +73,7 @@
73 self.assertEqual('test 123', dialog.props.text)73 self.assertEqual('test 123', dialog.props.text)
74 self.assertEqual(Gtk.MessageType.INFO, dialog.props.message_type)74 self.assertEqual(Gtk.MessageType.INFO, dialog.props.message_type)
75 buttons = dialog.get_action_area().get_children()75 buttons = dialog.get_action_area().get_children()
76 self.assertEqual('gtk-close', buttons[0].props.label)76 self.assertEqual('_Close', buttons[0].props.label)
7777
7878
79class WarningDialogTestCase(tests.TestCase):79class WarningDialogTestCase(tests.TestCase):
@@ -84,7 +84,7 @@
84 self.assertEqual('test 123', dialog.props.text)84 self.assertEqual('test 123', dialog.props.text)
85 self.assertEqual(Gtk.MessageType.WARNING, dialog.props.message_type)85 self.assertEqual(Gtk.MessageType.WARNING, dialog.props.message_type)
86 buttons = dialog.get_action_area().get_children()86 buttons = dialog.get_action_area().get_children()
87 self.assertEqual('gtk-close', buttons[0].props.label)87 self.assertEqual('_Close', buttons[0].props.label)
8888
8989
90class ErrorDialogTestCase(tests.TestCase):90class ErrorDialogTestCase(tests.TestCase):
@@ -95,7 +95,7 @@
95 self.assertEqual('test 123', dialog.props.text)95 self.assertEqual('test 123', dialog.props.text)
96 self.assertEqual(Gtk.MessageType.ERROR, dialog.props.message_type)96 self.assertEqual(Gtk.MessageType.ERROR, dialog.props.message_type)
97 buttons = dialog.get_action_area().get_children()97 buttons = dialog.get_action_area().get_children()
98 self.assertEqual('gtk-close', buttons[0].props.label)98 self.assertEqual('_Close', buttons[0].props.label)
9999
100100
101class PasswordDialogTestCase(tests.TestCase):101class PasswordDialogTestCase(tests.TestCase):
@@ -110,13 +110,13 @@
110 self.assertEqual('test password', widgets[0].props.label)110 self.assertEqual('test password', widgets[0].props.label)
111 self.assertEqual(False, widgets[1].props.visibility)111 self.assertEqual(False, widgets[1].props.visibility)
112 buttons = dialog.get_action_area().get_children()112 buttons = dialog.get_action_area().get_children()
113 self.assertEqual('gtk-cancel', buttons[0].props.label)113 self.assertEqual('gtk-ok', buttons[0].props.label)
114 self.assertEqual(
115 Gtk.ResponseType.OK,
116 dialog.get_response_for_widget(buttons[0]))
117 self.assertEqual('gtk-cancel', buttons[1].props.label)
114 self.assertEqual(118 self.assertEqual(
115 Gtk.ResponseType.CANCEL,119 Gtk.ResponseType.CANCEL,
116 dialog.get_response_for_widget(buttons[0]))
117 self.assertEqual('gtk-ok', buttons[1].props.label)
118 self.assertEqual(
119 Gtk.ResponseType.OK,
120 dialog.get_response_for_widget(buttons[1]))120 dialog.get_response_for_widget(buttons[1]))
121121
122122
123123
=== modified file 'ui.py'
--- ui.py 2012-02-27 21:07:38 +0000
+++ ui.py 2016-11-27 17:35:27 +0000
@@ -104,7 +104,7 @@
104 self.finished()104 self.finished()
105105
106106
107class ProgressContainerMixin:107class ProgressContainerMixin(object):
108 """Expose GtkProgressBar methods to a container class."""108 """Expose GtkProgressBar methods to a container class."""
109109
110 def tick(self, *args, **kwargs):110 def tick(self, *args, **kwargs):

Subscribers

People subscribed via source and target branches

to all changes: