1
=== modified file 'lib/lp/testing/__init__.py'
2
--- lib/lp/testing/__init__.py	2010-08-20 20:31:18 +0000
3
+++ lib/lp/testing/__init__.py	2010-08-24 17:14:05 +0000
4
@@ -50,7 +50,6 @@
5
50
    ]
50
    ]
6
51
51
7
52
from contextlib import contextmanager
52
from contextlib import contextmanager
8
53
from cStringIO import StringIO
9
54
from datetime import (
53
from datetime import (
10
55
    datetime,
54
    datetime,
11
56
    timedelta,
55
    timedelta,
12
@@ -86,6 +85,8 @@
13
86
    )
85
    )
14
87
import subunit
86
import subunit
15
88
import testtools
87
import testtools
16
88
from testtools.content import Content
17
89
from testtools.content_type import UTF8_TEXT
18
89
import transaction
90
import transaction
19
90
# zope.exception demands more of frame objects than twisted.python.failure
91
# zope.exception demands more of frame objects than twisted.python.failure
20
91
# provides in its fake frames.  This is enough to make it work with them
92
# provides in its fake frames.  This is enough to make it work with them
21
@@ -392,15 +393,6 @@
22
392
                "Expected %s to be %s, but it was %s."
393
                "Expected %s to be %s, but it was %s."
23
393
                % (attribute_name, date, getattr(sql_object, attribute_name)))
394
                % (attribute_name, date, getattr(sql_object, attribute_name)))
24
394
395
25
395
    def assertEqual(self, a, b, message=''):
26
396
        """Assert that 'a' equals 'b'."""
27
397
        if a == b:
28
398
            return
29
399
        if message:
30
400
            message += '\n'
31
401
        self.fail("%snot equal:\na = %s\nb = %s\n"
32
402
                  % (message, pformat(a), pformat(b)))
33
403
34
404
    def assertIsInstance(self, instance, assert_class):
396
    def assertIsInstance(self, instance, assert_class):
35
405
        """Assert that an instance is an instance of assert_class.
397
        """Assert that an instance is an instance of assert_class.
36
406
398
37
@@ -451,11 +443,8 @@
38
451
443
39
452
    def attachOopses(self):
444
    def attachOopses(self):
40
453
        if len(self.oopses) > 0:
445
        if len(self.oopses) > 0:
41
454
            content_type = testtools.content_type.ContentType(
42
455
                "text", "plain", {"charset": "utf8"})
43
456
            for (i, oops) in enumerate(self.oopses):
446
            for (i, oops) in enumerate(self.oopses):
46
457
                content = testtools.content.Content(
447
                content = Content(UTF8_TEXT, oops.get_chunks)
45
458
                    content_type, oops.get_chunks)
47
459
                self.addDetail("oops-%d" % i, content)
448
                self.addDetail("oops-%d" % i, content)
48
460
449
49
461
    def setUp(self):
450
    def setUp(self):
50
462
451
51
=== modified file 'lib/lp/testing/matchers.py'
52
--- lib/lp/testing/matchers.py	2010-08-20 20:31:18 +0000
53
+++ lib/lp/testing/matchers.py	2010-08-24 17:14:05 +0000
54
@@ -15,7 +15,7 @@
55
15
    ]
15
    ]
56
16
16
57
17
from testtools.content import Content
17
from testtools.content import Content
59
18
from testtools.content_type import ContentType
18
from testtools.content_type import UTF8_TEXT
60
19
from testtools.matchers import (
19
from testtools.matchers import (
61
20
    Matcher,
20
    Matcher,
62
21
    Mismatch,
21
    Mismatch,
63
@@ -137,8 +137,7 @@
64
137
        result = []
137
        result = []
65
138
        for query in self.query_collector.queries:
138
        for query in self.query_collector.queries:
66
139
            result.append(unicode(query).encode('utf8'))
139
            result.append(unicode(query).encode('utf8'))
69
140
        return {'queries': Content(ContentType('text', 'plain',
140
        return {'queries': Content(UTF8_TEXT, lambda:['\n'.join(result)])}
68
141
            {'charset': 'utf8'}), lambda:['\n'.join(result)])}
70
142
 
141
 
71
143
142
72
144
class IsNotProxied(Mismatch):
143
class IsNotProxied(Mismatch):
73
145
144
74
=== modified file 'versions.cfg'
75
--- versions.cfg	2010-08-23 14:40:19 +0000
76
+++ versions.cfg	2010-08-24 17:14:05 +0000
77
@@ -65,8 +65,7 @@
78
65
SimpleTal = 4.1
65
SimpleTal = 4.1
79
66
sourcecodegen = 0.6.9
66
sourcecodegen = 0.6.9
80
67
storm = 0.17
67
storm = 0.17
83
68
# Has the LessThan matcher.
68
testtools = 0.9.6
82
69
testtools = 0.9.6dev91
84
70
transaction = 1.0.0
69
transaction = 1.0.0
85
71
Twisted = 10.1.0
70
Twisted = 10.1.0
86
72
uuid = 1.30
71
uuid = 1.30
Status:	Merged
Approved by:	Tim Penhey on 2010-08-25
Approved revision:	no longer in the source branch.
Merged at revision:	11436
Proposed branch:	lp:~jml/launchpad/testtools-0.9.6
Merge into:	lp:launchpad
Diff against target:	86 lines (+6/-19) 3 files modified lib/lp/testing/__init__.py (+3/-14) lib/lp/testing/matchers.py (+2/-3) versions.cfg (+1/-2)
To merge this branch:	bzr merge lp:~jml/launchpad/testtools-0.9.6
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tim Penhey (community)		2010-08-24	Approve on 2010-08-25
Review via email: mp+33556@code.launchpad.net