← 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: John Arbash Meinel
  • Date: 2010-08-24 19:21:32 UTC
  • mto: This revision was merged to the branch mainline in revision 5390.
  • Revision ID: john@arbash-meinel.com-20100824192132-2ktt5adkbk5bk1ct
Handle test_source and extensions. Also define an 'extern' protocol, to allow
the test suite to recognize that returning an object of that type is a Python object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
33
33
    conflicts,
34
34
    errors,
35
35
    osutils,
36
 
    status,
37
36
    )
38
37
import bzrlib.branch
39
38
from bzrlib.osutils import pathjoin
45
44
 
46
45
class BranchStatus(TestCaseWithTransport):
47
46
 
48
 
    def setUp(self):
49
 
        super(BranchStatus, self).setUp()
50
 
        # As TestCase.setUp clears all hooks, we install this default
51
 
        # post_status hook handler for the test.
52
 
        status.hooks.install_named_hook('post_status',
53
 
            status._show_shelve_summary,
54
 
            'bzr status')
55
 
 
56
 
    def assertStatus(self, expected_lines, working_tree, specific_files=None,
 
47
    def assertStatus(self, expected_lines, working_tree,
57
48
        revision=None, short=False, pending=True, verbose=False):
58
49
        """Run status in working_tree and look for output.
59
50
 
60
51
        :param expected_lines: The lines to look for.
61
52
        :param working_tree: The tree to run status in.
62
53
        """
63
 
        output_string = self.status_string(working_tree, specific_files, revision, short,
 
54
        output_string = self.status_string(working_tree, revision, short,
64
55
                pending, verbose)
65
56
        self.assertEqual(expected_lines, output_string.splitlines(True))
66
57
 
67
 
    def status_string(self, wt, specific_files=None, revision=None,
68
 
        short=False, pending=True, verbose=False):
 
58
    def status_string(self, wt, revision=None, short=False, pending=True,
 
59
        verbose=False):
69
60
        # use a real file rather than StringIO because it doesn't handle
70
61
        # Unicode very well.
71
62
        tof = codecs.getwriter('utf-8')(TemporaryFile())
72
 
        show_tree_status(wt, specific_files=specific_files, to_file=tof,
73
 
                revision=revision, short=short, show_pending=pending,
74
 
                verbose=verbose)
 
63
        show_tree_status(wt, to_file=tof, revision=revision, short=short,
 
64
                show_pending=pending, verbose=verbose)
75
65
        tof.seek(0)
76
66
        return tof.read().decode('utf-8')
77
67
 
212
202
        wt = self.make_branch_and_tree('.')
213
203
        b = wt.branch
214
204
 
215
 
        self.build_tree(['directory/','directory/hello.c',
216
 
                         'bye.c','test.c','dir2/',
217
 
                         'missing.c'])
 
205
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
218
206
        wt.add('directory')
219
207
        wt.add('test.c')
220
208
        wt.commit('testing')
221
 
        wt.add('missing.c')
222
 
        unlink('missing.c')
223
209
 
224
210
        self.assertStatus([
225
 
                'missing:\n',
226
 
                '  missing.c\n',
227
211
                'unknown:\n',
228
212
                '  bye.c\n',
229
213
                '  dir2/\n',
234
218
        self.assertStatus([
235
219
                '?   bye.c\n',
236
220
                '?   dir2/\n',
237
 
                '+!  missing.c\n',
238
221
                '?   directory/hello.c\n'
239
222
                ],
240
223
                wt, short=True)
277
260
        tof.seek(0)
278
261
        self.assertEquals(tof.readlines(), ['+N  test.c\n'])
279
262
 
280
 
        tof = StringIO()
281
 
        show_tree_status(wt, specific_files=['missing.c'], to_file=tof)
282
 
        tof.seek(0)
283
 
        self.assertEquals(tof.readlines(),
284
 
                          ['missing:\n',
285
 
                           '  missing.c\n'])
286
 
 
287
 
        tof = StringIO()
288
 
        show_tree_status(wt, specific_files=['missing.c'], to_file=tof,
289
 
                         short=True)
290
 
        tof.seek(0)
291
 
        self.assertEquals(tof.readlines(),
292
 
                          ['+!  missing.c\n'])
293
 
 
294
263
    def test_specific_files_conflicts(self):
295
264
        tree = self.make_branch_and_tree('.')
296
265
        self.build_tree(['dir2/'])
325
294
        wt.add('FILE_D')
326
295
        wt.add('FILE_E')
327
296
        wt.commit('Create five empty files.')
328
 
        with open('FILE_B', 'w') as f: f.write('Modification to file FILE_B.')
329
 
        with open('FILE_C', 'w') as f: f.write('Modification to file FILE_C.')
 
297
        open('FILE_B', 'w').write('Modification to file FILE_B.')
 
298
        open('FILE_C', 'w').write('Modification to file FILE_C.')
330
299
        unlink('FILE_E')  # FILE_E will be versioned but missing
331
 
        with open('FILE_Q', 'w') as f: f.write('FILE_Q is added but not committed.')
 
300
        open('FILE_Q', 'w').write('FILE_Q is added but not committed.')
332
301
        wt.add('FILE_Q')  # FILE_Q will be added but not committed
333
302
        open('UNVERSIONED_BUT_EXISTING', 'w')
334
303
        return wt
478
447
          ' M  FILE_B\n',
479
448
          'X   NONEXISTENT\n',
480
449
          ]
481
 
        expected.sort()
482
450
        out, err = self.run_bzr('status --short NONEXISTENT '
483
451
                                'FILE_A FILE_B UNVERSIONED_BUT_EXISTING '
484
452
                                'FILE_C FILE_D FILE_E FILE_Q', retcode=3)
485
 
        actual = out.splitlines(True)
486
 
        actual.sort()
487
 
        self.assertEqual(expected, actual)
 
453
        self.assertEqual(expected, out.splitlines(True))
488
454
        self.assertContainsRe(err,
489
455
                              r'.*ERROR: Path\(s\) do not exist: '
490
456
                              'NONEXISTENT.*')
554
520
        out, err = self.run_bzr('status branch1 -rbranch:branch2')
555
521
        self.assertEqual('', out)
556
522
 
557
 
    def test_status_with_shelves(self):
558
 
        """Ensure that _show_shelve_summary handler works.
559
 
        """
560
 
        wt = self.make_branch_and_tree('.')
561
 
        self.build_tree(['hello.c'])
562
 
        wt.add('hello.c')
563
 
        self.run_bzr(['shelve', '--all', '-m', 'foo'])
564
 
        self.build_tree(['bye.c'])
565
 
        wt.add('bye.c')
566
 
        self.assertStatus([
567
 
                'added:\n',
568
 
                '  bye.c\n',
569
 
                '1 shelf exists. See "bzr shelve --list" for details.\n',
570
 
            ],
571
 
            wt)
572
 
        self.run_bzr(['shelve', '--all', '-m', 'bar'])
573
 
        self.build_tree(['eggs.c', 'spam.c'])
574
 
        wt.add('eggs.c')
575
 
        wt.add('spam.c')
576
 
        self.assertStatus([
577
 
                'added:\n',
578
 
                '  eggs.c\n',
579
 
                '  spam.c\n',
580
 
                '2 shelves exist. See "bzr shelve --list" for details.\n',
581
 
            ],
582
 
            wt)
583
 
        self.assertStatus([
584
 
                'added:\n',
585
 
                '  spam.c\n',
586
 
            ],
587
 
            wt,
588
 
            specific_files=['spam.c'])
589
 
 
590
523
 
591
524
class CheckoutStatus(BranchStatus):
592
525
 
598
531
    def make_branch_and_tree(self, relpath):
599
532
        source = self.make_branch(pathjoin('..', relpath))
600
533
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
601
 
        checkout.set_branch_reference(source)
 
534
        bzrlib.branch.BranchReferenceFormat().initialize(checkout,
 
535
            target_branch=source)
602
536
        return checkout.create_workingtree()
603
537
 
604
538
 
645
579
        self.assertContainsRe(result, "[+]N  hello.txt\n")
646
580
 
647
581
        self.build_tree(['world.txt'])
648
 
        result = self.run_bzr("status -S -r 0")[0]
 
582
        result = self.run_bzr("status --short -r 0")[0]
649
583
        self.assertContainsRe(result, "[+]N  hello.txt\n" \
650
584
                                      "[?]   world.txt\n")
651
 
        result2 = self.run_bzr("status -S -r 0..")[0]
 
585
        result2 = self.run_bzr("status --short -r 0..")[0]
652
586
        self.assertEquals(result2, result)
653
587
 
654
588
    def test_status_versioned(self):