← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-08-30 09:03:33 UTC
  • mto: This revision was merged to the branch mainline in revision 6169.
  • Revision ID: jelmer@samba.org-20110830090333-64mdcfmszxkeyply
Rename --scan to --recursive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branches.py
42
42
        out, err = self.run_bzr('branches', working_dir='a')
43
43
        self.assertEquals(out, "")
44
44
 
45
 
    def test_scan_current(self):
 
45
    def test_recursive_current(self):
46
46
        self.run_bzr('init .')
47
 
        self.assertEquals(".\n", self.run_bzr('branches --scan')[0])
 
47
        self.assertEquals(".\n", self.run_bzr('branches --recursive')[0])
48
48
 
49
 
    def test_scan(self):
 
49
    def test_recursive(self):
50
50
        self.run_bzr('init source')
51
51
        self.run_bzr('init source/subsource')
52
52
        self.run_bzr('checkout --lightweight source checkout')
53
53
        self.run_bzr('init checkout/subcheckout')
54
54
        self.run_bzr('init checkout/.bzr/subcheckout')
55
 
        out = self.run_bzr('branches --scan')[0]
 
55
        out = self.run_bzr('branches --recursive')[0]
56
56
        lines = out.split('\n')
57
57
        self.assertIs(True, 'source' in lines, lines)
58
58
        self.assertIs(True, 'source/subsource' in lines, lines)