← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Ferlito
  • Date: 2009-05-25 10:59:42 UTC
  • mto: (4665.4.1 ppa-doc)
  • mto: This revision was merged to the branch mainline in revision 4693.
  • Revision ID: johnf@inodes.org-20090525105942-5xkcbe37m1u5lp5z
Update packaging scripts to make deployment a bit easier
Update documentation for deploying to PPA

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
 
from bzrlib import (
25
 
    tests,
26
 
    workingtree,
27
 
    )
 
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
28
29
 
29
30
 
30
31
def subst_dates(string):
33
34
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
34
35
 
35
36
 
36
 
class DiffBase(tests.TestCaseWithTransport):
 
37
class DiffBase(ExternalBase):
37
38
    """Base class with common setup method"""
38
39
 
39
40
    def make_example_branch(self):
354
355
 
355
356
    def test_external_diff(self):
356
357
        """Test that we can spawn an external diff process"""
357
 
        self.disable_missing_extensions_warning()
358
358
        # We have to use run_bzr_subprocess, because we need to
359
359
        # test writing directly to stdout, (there was a bug in
360
360
        # subprocess.py that we had to workaround).
361
361
        # However, if 'diff' may not be available
362
362
        self.make_example_branch()
363
 
        # this will be automatically restored by the base bzr test class
364
 
        os.environ['BZR_PROGRESS_BAR'] = 'none'
365
 
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
366
 
                                           universal_newlines=True,
367
 
                                           retcode=None)
 
363
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
364
        try:
 
365
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
366
            out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
 
367
                                               universal_newlines=True,
 
368
                                               retcode=None)
 
369
        finally:
 
370
            if orig_progress is None:
 
371
                del os.environ['BZR_PROGRESS_BAR']
 
372
            else:
 
373
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
374
 
368
375
        if 'Diff is not installed on this machine' in err:
369
 
            raise tests.TestSkipped("No external 'diff' is available")
 
376
            raise TestSkipped("No external 'diff' is available")
370
377
        self.assertEqual('', err)
371
378
        # We have to skip the stuff in the middle, because it depends
372
379
        # on time.time()