Replace newline characters in factory tests

client/site_tests/factory_Review/factory_Review.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # DESCRIPTION :
 #
 # This is an example factory test that does not really do anything --
 # it displays a message in the center of the testing area, as
 # communicated by arguments to run_once().  This test makes use of the
 # factory_ui_lib library to display its UI, and to monitor keyboard
 # events for test-switching triggers.  This test can be terminated by
 # typing SHIFT-Q.
 
 
 import gtk
 import pango
 import sys
 
 from gtk import gdk
 from itertools import count, izip, product
 
 from autotest_lib.client.bin import factory
 from autotest_lib.client.bin import factory_ui_lib as ful
 from autotest_lib.client.bin import test
-from autotest_lib.client.common_lib import error
 
 from factory import AutomatedSequence
 
 N_ROW = 15
 LABEL_EN_SIZE = (170, 35)
 LABEL_EN_SIZE_2 = (450, 25)
 LABEL_EN_FONT = pango.FontDescription('courier new extra-condensed 16')
 TAB_BORDER = 20
 
 def trim(text, length):
@@ skipping 37 matching lines @@
                                           fg=ful.LABEL_COLORS[status])
             status_table.attach(status_label, j, j+1, i, i+1)
 
         vbox = gtk.VBox()
         vbox.set_spacing(20)
         vbox.pack_start(info_box, False, False)
         vbox.pack_start(status_table, False, False)
         return vbox
 
     def make_error_tab(self, status_map, t):
-        msg = '%s (%s)\n%s' % (t.label_en, t.label_zw,
-                               status_map.lookup_error_msg(t))
+        msg = status_map.lookup_error_msg(t)
+        if isinstance(msg, str) or isinstance(msg, str):
+            msg = msg.replace('<br/>', '\n')
+        msg = '%s (%s)\n%s' % (t.label_en, t.label_zw, msg)
         label = ful.make_label(msg,
                                font=LABEL_EN_FONT,
                                alignment=(0.0, 0.0))
         label.set_line_wrap(True)
         frame = gtk.Frame()
         frame.add(label)
         return frame
 
     def key_release_callback(self, widget, event):
         factory.log('key_release_callback %s(%s)' %
@@ skipping 44 matching lines @@
         vbox.pack_start(self.notebook, False, False)
 
         test_widget = gtk.EventBox()
         test_widget.modify_bg(gtk.STATE_NORMAL, ful.BLACK)
         test_widget.add(vbox)
 
         ful.run_test_widget(self.job, test_widget,
                             window_registration_callback=self.register_callback)
 
         factory.log('%s run_once finished' % self.__class__)