← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
27
27
        
28
28
    def test_add_reports(self):
29
29
        """add command prints the names of added files."""
30
 
        self.run_bzr('init')
 
30
        tree = self.make_branch_and_tree('.')
31
31
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
32
32
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
33
33
        out = self.run_bzr('add')[0]
50
50
 
51
51
    def test_add_quiet_is(self):
52
52
        """add -q does not print the names of added files."""
53
 
        self.run_bzr('init')
 
53
        tree = self.make_branch_and_tree('.') 
54
54
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
55
55
        out = self.run_bzr('add -q')[0]
56
56
        # the ordering is not defined at the moment
62
62
 
63
63
        "bzr add" should add the parent(s) as necessary.
64
64
        """
65
 
        self.run_bzr('init')
 
65
        tree = self.make_branch_and_tree('.')
66
66
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
67
67
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
68
68
        self.run_bzr('add inertiatic/esp')
85
85
 
86
86
        "bzr add" should do this happily.
87
87
        """
88
 
        self.run_bzr('init')
 
88
        tree = self.make_branch_and_tree('.')
89
89
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
90
90
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
91
91
        self.run_bzr('add --no-recurse inertiatic')