1
=== modified file 'lib/devscripts/ec2test/remote.py'
2
--- lib/devscripts/ec2test/remote.py	2010-04-28 11:37:02 +0000
3
+++ lib/devscripts/ec2test/remote.py	2010-05-09 12:56:33 +0000
4
@@ -190,6 +190,9 @@
5
190
                    conn.send_email(self.pqm_message)
190
                    conn.send_email(self.pqm_message)
6
191
                    summary_file.write(
191
                    summary_file.write(
7
192
                        '\n\nSUBMITTED TO PQM:\n%s\n' % (subject,))
192
                        '\n\nSUBMITTED TO PQM:\n%s\n' % (subject,))
8
193
9
194
            summary_file.write(
10
195
                '\n(See the attached file for the complete log)\n')
11
193
        except:
196
        except:
12
194
            summary_file.write('\n\nERROR IN TESTRUNNER\n\n')
197
            summary_file.write('\n\nERROR IN TESTRUNNER\n\n')
13
195
            traceback.print_exc(file=summary_file)
198
            traceback.print_exc(file=summary_file)
14
@@ -259,8 +262,7 @@
15
259
        # Only write to stdout if we are running as the foreground process.
262
        # Only write to stdout if we are running as the foreground process.
16
260
        echo_to_stdout = not self.daemonized
263
        echo_to_stdout = not self.daemonized
17
261
        result = SummaryResult(summary_file)
264
        result = SummaryResult(summary_file)
20
262
        subunit_server = subunit.TestProtocolServer(
265
        subunit_server = subunit.TestProtocolServer(result, summary_file)
19
263
            result, FlagFallStream(summary_file, 'Running tests.'))
21
264
        for line in input_stream:
266
        for line in input_stream:
22
265
            subunit_server.lineReceived(line)
267
            subunit_server.lineReceived(line)
23
266
            out_file.write(line)
268
            out_file.write(line)
24
267
269
25
=== modified file 'lib/devscripts/ec2test/tests/test_remote.py'
26
--- lib/devscripts/ec2test/tests/test_remote.py	2010-04-28 11:59:31 +0000
27
+++ lib/devscripts/ec2test/tests/test_remote.py	2010-05-09 12:56:33 +0000
28
@@ -6,6 +6,7 @@
29
6
__metaclass__ = type
6
__metaclass__ = type
30
7
7
31
8
from StringIO import StringIO
8
from StringIO import StringIO
32
9
import sys
33
9
import unittest
10
import unittest
34
10
11
35
11
from devscripts.ec2test.remote import SummaryResult
12
from devscripts.ec2test.remote import SummaryResult
36
@@ -14,6 +15,14 @@
37
14
class TestSummaryResult(unittest.TestCase):
15
class TestSummaryResult(unittest.TestCase):
38
15
    """Tests for `SummaryResult`."""
16
    """Tests for `SummaryResult`."""
39
16
17
40
18
    def makeException(self, factory=None, *args, **kwargs):
41
19
        if factory is None:
42
20
            factory = RuntimeError
43
21
        try:
44
22
            raise factory(*args, **kwargs)
45
23
        except:
46
24
            return sys.exc_info()
47
25
48
17
    def test_printError(self):
26
    def test_printError(self):
49
18
        # SummaryResult.printError() prints out the name of the test, the kind
27
        # SummaryResult.printError() prints out the name of the test, the kind
50
19
        # of error and the details of the error in a nicely-formatted way.
28
        # of error and the details of the error in a nicely-formatted way.
51
@@ -24,6 +33,40 @@
52
24
            result.double_line, result.single_line)
33
            result.double_line, result.single_line)
53
25
        self.assertEqual(expected, stream.getvalue())
34
        self.assertEqual(expected, stream.getvalue())
54
26
35
55
36
    def test_addError(self):
56
37
        # SummaryResult.addError() prints a nicely-formatted error.
57
38
        #
58
39
        # First, use printError to build the error text we expect.
59
40
        test = self
60
41
        stream = StringIO()
61
42
        result = SummaryResult(stream)
62
43
        error = self.makeException()
63
44
        result.printError(
64
45
            'ERROR', test, result._exc_info_to_string(error, test))
65
46
        expected = stream.getvalue()
66
47
        # Now, call addError and check that it matches.
67
48
        stream = StringIO()
68
49
        result = SummaryResult(stream)
69
50
        result.addError(test, error)
70
51
        self.assertEqual(expected, stream.getvalue())
71
52
72
53
    def test_addFailure(self):
73
54
        # SummaryResult.addFailure() prints a nicely-formatted error.
74
55
        #
75
56
        # First, use printError to build the error text we expect.
76
57
        test = self
77
58
        stream = StringIO()
78
59
        result = SummaryResult(stream)
79
60
        error = self.makeException(test.failureException)
80
61
        result.printError(
81
62
            'FAILURE', test, result._exc_info_to_string(error, test))
82
63
        expected = stream.getvalue()
83
64
        # Now, call addFailure and check that it matches.
84
65
        stream = StringIO()
85
66
        result = SummaryResult(stream)
86
67
        result.addFailure(test, error)
87
68
        self.assertEqual(expected, stream.getvalue())
88
69
89
27
70
90
28
def test_suite():
71
def test_suite():
91
29
    return unittest.TestLoader().loadTestsFromName(__name__)
72
    return unittest.TestLoader().loadTestsFromName(__name__)
Status:	Merged
Approved by:	Eleanor Berger on 2010-04-30
Approved revision:	no longer in the source branch.
Merged at revision:	10840
Proposed branch:	lp:~jml/launchpad/still-more-tests-for-ec2
Merge into:	lp:launchpad
Diff against target:	91 lines (+47/-2) 2 files modified lib/devscripts/ec2test/remote.py (+4/-2) lib/devscripts/ec2test/tests/test_remote.py (+43/-0)
To merge this branch:	bzr merge lp:~jml/launchpad/still-more-tests-for-ec2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Eleanor Berger (community)		2010-04-30	Approve on 2010-04-30
Review via email: mp+24503@code.launchpad.net