/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-17 10:33:29 UTC
  • mfrom: (4697.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090917103329-khwup105uhik6zje
(vila) Fix test failures with no C extensions loaded

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
21
21
import os
22
22
import re
23
23
 
24
 
import bzrlib
25
 
from bzrlib import workingtree
26
 
from bzrlib.branch import Branch
27
 
from bzrlib.tests import TestSkipped
28
 
from bzrlib.tests.blackbox import ExternalBase
 
24
from bzrlib import (
 
25
    config,
 
26
    tests,
 
27
    workingtree,
 
28
    )
29
29
 
30
30
 
31
31
def subst_dates(string):
34
34
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
35
35
 
36
36
 
37
 
class DiffBase(ExternalBase):
 
37
class DiffBase(tests.TestCaseWithTransport):
38
38
    """Base class with common setup method"""
39
39
 
40
40
    def make_example_branch(self):
355
355
 
356
356
    def test_external_diff(self):
357
357
        """Test that we can spawn an external diff process"""
 
358
        self.disable_missing_extensions_warning()
358
359
        # We have to use run_bzr_subprocess, because we need to
359
360
        # test writing directly to stdout, (there was a bug in
360
361
        # subprocess.py that we had to workaround).
366
367
                                           universal_newlines=True,
367
368
                                           retcode=None)
368
369
        if 'Diff is not installed on this machine' in err:
369
 
            raise TestSkipped("No external 'diff' is available")
 
370
            raise tests.TestSkipped("No external 'diff' is available")
370
371
        self.assertEqual('', err)
371
372
        # We have to skip the stuff in the middle, because it depends
372
373
        # on time.time()