~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2006-08-03 14:27:38 UTC
  • mto: This revision was merged to the branch mainline in revision 1934.
  • Revision ID: abentley@panoramicfeedback.com-20060803142738-c25a7730d8a16b1a
Fix a bunch of test cases that assumed --merge-type or log-format

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
        self.bzr('commit', '-m', '2')
40
40
 
41
41
        # only the lines formatter is this short
42
 
        self.assertEquals(7, len(self.bzr('log', '--log-format', 'short').split('\n')))
 
42
        self.assertEquals(7, len(self.bzr('log', '--short').split('\n')))
43
43
 
44
44
    def test_missing_default_format(self):
45
45
        self.setup_config()
91
91
 
92
92
        os.chdir('../b')
93
93
        
94
 
        self.assertEquals(9, len(self.bzr('missing', '--log-format', 'short', retcode=1).split('\n')))
 
94
        self.assertEquals(9, len(self.bzr('missing', '--short', retcode=1).split('\n')))
95
95
        
96
96
        os.chdir('..')
97
97