← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-08-31 08:25:15 UTC
  • mfrom: (5247.7.1 catch-them-all)
  • mto: This revision was merged to the branch mainline in revision 5400.
  • Revision ID: v.ladeuil+lp@free.fr-20100831082515-an9mtdmhalo7xaq0
Merge catch-them-all into more-ignored-exceptions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_aliases.py
18
18
 
19
19
import os
20
20
 
 
21
from bzrlib import config
21
22
from bzrlib.branch import Branch
22
23
from bzrlib.tests import TestCaseWithTransport
23
24
from bzrlib.trace import mutter
24
 
from bzrlib.config import (ensure_config_dir_exists, config_filename)
25
25
 
26
26
 
27
27
class TestAliases(TestCaseWithTransport):
35
35
            return self.run_bzr(args, **kwargs)[1]
36
36
 
37
37
 
38
 
        if os.path.isfile(config_filename()):
39
 
            # Something is wrong in environment,
40
 
            # we risk overwriting users config
41
 
            self.assert_(config_filename() + "exists, abort")
42
 
 
43
 
        ensure_config_dir_exists()
44
 
        CONFIG=("[ALIASES]\n"
45
 
                "c=cat\n"
46
 
                "c1=cat -r 1\n"
47
 
                "c2=cat -r 1 -r2\n")
48
 
 
49
 
        open(config_filename(),'wb').write(CONFIG)
 
38
        conf = config.GlobalConfig.from_string('''[ALIASES]
 
39
c=cat
 
40
c1=cat -r 1
 
41
c2=cat -r 1 -r2
 
42
''', save=True)
50
43
 
51
44
        str1 = 'foo\n'
52
45
        str2 = 'bar\n'