← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-06-22 18:24:25 UTC
  • mfrom: (1803 +trunk)
  • mto: (1793.3.6 bundle-fixes)
  • mto: This revision was merged to the branch mainline in revision 1806.
  • Revision ID: john@arbash-meinel.com-20060622182425-6f45cb7acd587216
[merge] bzr.dev 1804 and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_logformats.py
14
14
        return self.run_bzr(*args, **kwargs)[0]
15
15
 
16
16
    def test_log_default_format(self):
17
 
        setup_config()
 
17
        self.setup_config()
18
18
 
19
19
        self.bzr('init')
20
20
        open('a', 'wb').write('foo\n')
42
42
        self.assertEquals(7, len(self.bzr('log', '--log-format', 'short').split('\n')))
43
43
 
44
44
    def test_missing_default_format(self):
45
 
        setup_config()
 
45
        self.setup_config()
46
46
 
47
47
        os.mkdir('a')
48
48
        os.chdir('a')
69
69
        os.chdir('..')
70
70
 
71
71
    def test_missing_format_arg(self):
72
 
        setup_config()
 
72
        self.setup_config()
73
73
 
74
74
        os.mkdir('a')
75
75
        os.chdir('a')
96
96
        os.chdir('..')
97
97
 
98
98
 
99
 
def setup_config():
 
99
    def setup_config(self):
100
100
        if os.path.isfile(config_filename()):
101
101
                # Something is wrong in environment, 
102
102
                # we risk overwriting users config 
108
108
                "log_format=line\n")
109
109
 
110
110
        open(config_filename(),'wb').write(CONFIG)
111