← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
577
577
            self.fail("%r is an instance of %s rather than %s" % (
578
578
                obj, obj.__class__, kls))
579
579
 
580
 
    def assertDeprecated(self, expected, callable, *args, **kwargs):
 
580
    def callDeprecated(self, expected, callable, *args, **kwargs):
581
581
        """Assert that a callable is deprecated in a particular way.
582
582
 
583
583
        :param expected: a list of the deprecation warnings expected, in order
592
592
        method = symbol_versioning.warn
593
593
        symbol_versioning.set_warning_method(capture_warnings)
594
594
        try:
595
 
            callable(*args, **kwargs)
 
595
            result = callable(*args, **kwargs)
596
596
        finally:
597
 
            result = symbol_versioning.set_warning_method(method)
 
597
            symbol_versioning.set_warning_method(method)
598
598
        self.assertEqual(expected, local_warnings)
599
599
        return result
600
600
 
604
604
        The file is removed as the test is torn down.
605
605
        """
606
606
        fileno, name = tempfile.mkstemp(suffix='.log', prefix='testbzr')
607
 
        encoder, decoder, stream_reader, stream_writer = codecs.lookup('UTF-8')
608
 
        self._log_file = stream_writer(os.fdopen(fileno, 'w+'))
 
607
        self._log_file = os.fdopen(fileno, 'w+')
609
608
        self._log_nonce = bzrlib.trace.enable_test_log(self._log_file)
610
609
        self._log_file_name = name
611
610
        self.addCleanup(self._finishLogFile)
1370
1369
                   'bzrlib.tests.test_selftest',
1371
1370
                   'bzrlib.tests.test_setup',
1372
1371
                   'bzrlib.tests.test_sftp_transport',
 
1372
                   'bzrlib.tests.test_ftp_transport',
1373
1373
                   'bzrlib.tests.test_smart_add',
1374
1374
                   'bzrlib.tests.test_source',
1375
1375
                   'bzrlib.tests.test_status',