← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/testing/__init__.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2010-08-25 12:36:38 UTC
  • mfrom: (11407.3.2 testtools-0.9.6)
  • Revision ID: launchpad@pqm.canonical.com-20100825123638-gsbyehsy7nnk2d7y
[r=thumper][ui=none][no-qa] Upgrade to testtools 0.9.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/testing/__init__.py
50
50
    ]
51
51
 
52
52
from contextlib import contextmanager
53
 
from cStringIO import StringIO
54
53
from datetime import (
55
54
    datetime,
56
55
    timedelta,
86
85
    )
87
86
import subunit
88
87
import testtools
 
88
from testtools.content import Content
 
89
from testtools.content_type import UTF8_TEXT
89
90
import transaction
90
91
# zope.exception demands more of frame objects than twisted.python.failure
91
92
# provides in its fake frames.  This is enough to make it work with them
392
393
                "Expected %s to be %s, but it was %s."
393
394
                % (attribute_name, date, getattr(sql_object, attribute_name)))
394
395
 
395
 
    def assertEqual(self, a, b, message=''):
396
 
        """Assert that 'a' equals 'b'."""
397
 
        if a == b:
398
 
            return
399
 
        if message:
400
 
            message += '\n'
401
 
        self.fail("%snot equal:\na = %s\nb = %s\n"
402
 
                  % (message, pformat(a), pformat(b)))
403
 
 
404
396
    def assertIsInstance(self, instance, assert_class):
405
397
        """Assert that an instance is an instance of assert_class.
406
398
 
451
443
 
452
444
    def attachOopses(self):
453
445
        if len(self.oopses) > 0:
454
 
            content_type = testtools.content_type.ContentType(
455
 
                "text", "plain", {"charset": "utf8"})
456
446
            for (i, oops) in enumerate(self.oopses):
457
 
                content = testtools.content.Content(
458
 
                    content_type, oops.get_chunks)
 
447
                content = Content(UTF8_TEXT, oops.get_chunks)
459
448
                self.addDetail("oops-%d" % i, content)
460
449
 
461
450
    def setUp(self):