← Back to branch summary

~ubuntu-branches/ubuntu/natty/mago/natty

« back to all changes in this revision

Viewing changes to mago/cmd/runner.py

  • Committer: Bazaar Package Importer
  • Author(s): Ara Pulido
  • Date: 2010-10-18 16:08:42 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20101018160842-6euef3m6mqxjlcai
Tags: 0.3-0ubuntu1
* New upstream release:
  + Added i18n support
  + Tests working on Maverick 

Show diffs side-by-side

added added

removed removed

Lines of Context:
mago/cmd/runner.py
40
40
        except AssertionError, e:
41
41
            # The test failed.
42
42
            if len(e.args) > 1:
43
 
                self.results.append('message', e.args[0])
 
43
                self.results.append('message', e.args[0].encode("utf-8"))
44
44
                self.results.append_screenshot(e.args[1])
45
45
            else:
46
 
                self.results.append('message', str(e))
 
46
                self.results.append('message', e.args[0].encode("utf-8"))
47
47
                self.results.append_screenshot()
48
48
            self.results.append('stacktrace', traceback.format_exc())
49
49
            self.results['pass'] = 0
51
51
            # There was an unrelated error.
52
52
            logging.warning(traceback.format_exc())
53
53
            if len(e.args) > 1 and os.path.exists(e.args[1]):
54
 
                self.results.append('message', e.args[0])
 
54
                self.results.append('message', e.args[0].encode("utf-8"))
55
55
                self.results.append_screenshot(e.args[1])
56
56
            else:
57
 
                self.results.append('message', str(e))
 
57
                self.results.append('message', e.args[0].encode("utf-8"))
58
58
                self.results.append_screenshot()
59
59
            self.results.append('stacktrace', traceback.format_exc())
60
60
            self.results['error'] = 1
107
107
        except Exception, e:
108
108
            logging.warning(traceback.format_exc())
109
109
            # There was an unrelated error.
110
 
            self.results.append('message', str(e))
 
110
            self.results.append('message', e.args[0].encode("utf-8"))
111
111
            self.results.append('stacktrace', traceback.format_exc())
112
112
            self.results['error'] = 1
113
113
            try: