← 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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
24
24
 
25
25
 
26
26
class TestAdd(ExternalBase):
27
 
        
 
27
 
28
28
    def test_add_reports(self):
29
29
        """add command prints the names of added files."""
30
30
        tree = self.make_branch_and_tree('.')
51
51
 
52
52
    def test_add_quiet_is(self):
53
53
        """add -q does not print the names of added files."""
54
 
        tree = self.make_branch_and_tree('.') 
 
54
        tree = self.make_branch_and_tree('.')
55
55
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
56
56
        out = self.run_bzr('add -q')[0]
57
57
        # the ordering is not defined at the moment
101
101
        eq = self.assertEqual
102
102
        ass = self.assertTrue
103
103
        chdir = os.chdir
104
 
        
 
104
 
105
105
        t = self.make_branch_and_tree('.')
106
106
        b = t.branch
107
107
        self.build_tree(['src/', 'README'])
108
 
        
 
108
 
109
109
        eq(sorted(t.unknowns()),
110
110
           ['README', 'src'])
111
 
        
 
111
 
112
112
        self.run_bzr('add src')
113
 
        
 
113
 
114
114
        self.build_tree(['src/foo.c'])
115
 
        
 
115
 
116
116
        # add with no arguments in a subdirectory gets only files below that
117
117
        # subdirectory
118
118
        chdir('src')
123
123
        versioned = [path for path, entry in t.iter_entries_by_dir()]
124
124
        self.assertEquals(versioned,
125
125
            ['', 'src', 'src/foo.c'])
126
 
                
 
126
 
127
127
        # add from the parent directory should pick up all file names
128
128
        chdir('..')
129
129
        self.run_bzr('add')