← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-09-09 17:20:52 UTC
  • mto: This revision was merged to the branch mainline in revision 6148.
  • Revision ID: v.ladeuil+lp@free.fr-20110909172052-hk61nux3nvt2vlv8
Add new paraneters add signature's ends, fix a test and a typo, check that no errors and no output is emitted when using assertLogRevnos.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
90
90
        return self.log_catcher.revisions
91
91
 
92
92
    def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
93
 
        self.run_bzr(['log'] + args, working_dir=working_dir)
 
93
        err, out = self.run_bzr(['log'] + args, working_dir=working_dir)
 
94
        self.assertEqual('', out)
 
95
        self.assertEqual('', err)
94
96
        self.assertEqual(expected_revnos,
95
97
                         [r.revno for r in self.get_captured_revisions()])
96
98
 
551
553
 
552
554
    def test_include_sidelines(self):
553
555
        # Confirm --include-sidelines gives the same output as -n0
554
 
        self.assertLogRevnos(['--include-sidelines'],
555
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
556
 
                             working_dir='level0')
557
 
        self.assertLogRevnos(['--include-sidelines'],
558
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
559
 
                             working_dir='level0')
560
 
        out_im, err_im = self.run_bzr('log --include-sidelines',
561
 
                                      working_dir='level0')
562
 
        out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
563
 
        self.assertEqual('', err_im)
564
 
        self.assertEqual('', err_n0)
565
 
        self.assertEqual(out_im, out_n0)
 
556
        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']
 
557
        self.assertLogRevnos(['--include-sidelines'],
 
558
                             expected, working_dir='level0')
 
559
        self.assertLogRevnos(['--include-sidelines'],
 
560
                             expected, working_dir='level0')
566
561
 
567
562
    def test_force_merge_revisions_N(self):
568
563
        self.assertLogRevnos(['-n2'],