Merge lp:~nataliabidart/ubuntu-sso-client/fix-nigthlies-test into lp:ubuntu-sso-client

[Natalia Bidart]

- Making test more robust to prevent spurious failures (LP: #973345).

[Alejandro J. Cura (alecu)]

Let's hope this fixes the issue.
If it does not, I have a few more ideas to try to fix this test in the nightlies.

review: Approve

=== modified file 'ubuntu_sso/qt/tests/__init__.py'
--- ubuntu_sso/qt/tests/__init__.py	2012-03-14 17:14:07 +0000
+++ ubuntu_sso/qt/tests/__init__.py	2012-04-04 17:59:22 +0000
@@ -39,12 +39,14 @@
 
 
 def build_string_for_pixels(label, width):
-    """Return a random string that will be as big as with in pixels."""
-    char = 'a'
+    """Return a random string that will be as big as 'width' in pixels."""
+    char = 'm'
     fm = QtGui.QFontMetrics(label.font())
     pixel_width = fm.width(char)
     chars = int(width / pixel_width)
-    return char * chars
+    result = char * chars
+    assert pixel_width * chars <= width
+    return result
 
 
 class FakedObject(object):

=== modified file 'ubuntu_sso/qt/tests/test_common.py'
--- ubuntu_sso/qt/tests/test_common.py	2012-03-15 19:16:15 +0000
+++ ubuntu_sso/qt/tests/test_common.py	2012-04-04 17:59:22 +0000
@@ -257,7 +257,7 @@
 
     def test_text_not_elided_if_too_short(self):
         """If text is shorter than max_width, do not elide."""
-        text = build_string_for_pixels(self.ui, self.max_width - 1)
+        text = build_string_for_pixels(self.ui, self.max_width - 10)
 
         maybe_elide_text(self.ui, text, self.max_width)
 
@@ -277,7 +277,7 @@
 
     def test_text_elided_if_bigger_than_max_width(self):
         """If text is equal than max_width, do not elide."""
-        text = build_string_for_pixels(self.ui, self.max_width + 10)
+        text = build_string_for_pixels(self.ui, self.max_width * 2)
 
         maybe_elide_text(self.ui, text, self.max_width)