← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-07 10:45:44 UTC
  • mfrom: (2321.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070307104544-59e3e6358e4bdb29
(robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
40
40
 
41
41
class BranchStatus(TestCaseWithTransport):
42
42
    
43
 
    def assertStatus(self, output_lines, working_tree,
 
43
    def assertStatus(self, expected_lines, working_tree,
44
44
        revision=None, short=False):
45
45
        """Run status in working_tree and look for output.
46
46
        
47
 
        :param output_lines: The lines to look for.
 
47
        :param expected_lines: The lines to look for.
48
48
        :param working_tree: The tree to run status in.
49
49
        """
50
50
        output_string = self.status_string(working_tree, revision, short)
51
 
        self.assertEqual(output_lines, output_string.splitlines(True))
 
51
        self.assertEqual(expected_lines, output_string.splitlines(True))
52
52
    
53
53
    def status_string(self, wt, revision=None, short=False):
54
54
        # use a real file rather than StringIO because it doesn't handle
155
155
        self.assert_("Empty commit 3" in message)
156
156
        self.assertEndsWith(message, "...\n")
157
157
 
158
 
    def test_branch_status_specific_files(self): 
 
158
    def test_tree_status_ignores(self):
 
159
        """Tests branch status with ignores"""
 
160
        wt = self.make_branch_and_tree('.')
 
161
        self.run_bzr('ignore', '*~')
 
162
        wt.commit('commit .bzrignore')
 
163
        self.build_tree(['foo.c', 'foo.c~'])
 
164
        self.assertStatus([
 
165
                'unknown:\n',
 
166
                '  foo.c\n',
 
167
                ],
 
168
                wt)
 
169
        self.assertStatus([
 
170
                '?   foo.c\n',
 
171
                ],
 
172
                wt, short=True)
 
173
 
 
174
    def test_tree_status_specific_files(self):
159
175
        """Tests branch status with given specific files"""
160
176
        wt = self.make_branch_and_tree('.')
161
177
        b = wt.branch
168
184
        self.assertStatus([
169
185
                'unknown:\n',
170
186
                '  bye.c\n',
171
 
                '  dir2\n',
 
187
                '  dir2/\n',
172
188
                '  directory/hello.c\n'
173
189
                ],
174
190
                wt)
175
191
 
176
192
        self.assertStatus([
177
193
                '?   bye.c\n',
178
 
                '?   dir2\n',
 
194
                '?   dir2/\n',
179
195
                '?   directory/hello.c\n'
180
196
                ],
181
197
                wt, short=True)
204
220
        tof.seek(0)
205
221
        self.assertEquals(tof.readlines(),
206
222
                          ['unknown:\n',
207
 
                           '  dir2\n'
 
223
                           '  dir2/\n'
208
224
                           ])
209
225
        tof = StringIO()
210
226
        show_tree_status(wt, specific_files=['dir2'], to_file=tof, short=True)
211
227
        tof.seek(0)
212
 
        self.assertEquals(tof.readlines(), ['?   dir2\n'])
 
228
        self.assertEquals(tof.readlines(), ['?   dir2/\n'])
213
229
 
214
230
    def test_status_nonexistent_file(self):
215
231
        # files that don't exist in either the basis tree or working tree