Merge lp:~dobey/ubuntu-sso-client/warning-color-tests into lp:ubuntu-sso-client

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 971
Merged at revision: 971
Proposed branch: lp:~dobey/ubuntu-sso-client/warning-color-tests
Merge into: lp:ubuntu-sso-client
Diff against target: 17 lines (+4/-3)
1 file modified
ubuntu_sso/gtk/tests/test_gui.py (+4/-3)
To merge this branch: bzr merge lp:~dobey/ubuntu-sso-client/warning-color-tests
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+110894@code.launchpad.net

Commit message

Disable the color validation for warning labels due to new GTK+ breaking it.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Considering there is no straightforward option to make these work, I'm approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py 2012-06-13 19:57:54 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py 2012-06-18 19:45:23 +0000
@@ -446,9 +446,10 @@
446 self.assertEqual(actual, message)446 self.assertEqual(actual, message)
447447
448 # content color is correct448 # content color is correct
449 expected = gui.WARNING_TEXT_COLOR449 # FIXME - New GTK+ 3.5 breaks this check - see bug #1014772
450 actual = label.get_style().fg[Gtk.StateFlags.NORMAL]450 # expected = gui.WARNING_TEXT_COLOR
451 self.assert_color_equal(expected, actual)451 # actual = label.get_style().fg[Gtk.StateFlags.NORMAL]
452 # self.assert_color_equal(expected, actual)
452453
453 def assert_correct_entry_warning(self, entry, message):454 def assert_correct_entry_warning(self, entry, message):
454 """Check that a warning is shown displaying 'message'."""455 """Check that a warning is shown displaying 'message'."""

Subscribers

People subscribed via source and target branches