~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: 2010-09-09 05:51:26 UTC
  • mfrom: (5403.1.4 bug-626687)
  • Revision ID: pqm@pqm.ubuntu.com-20100909055126-qwo256ldpnz7o0c4
(mbp) ignore __pycache__ by default (Andrea Corbellini)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
521
520
        out, err = self.run_bzr('status branch1 -rbranch:branch2')
522
521
        self.assertEqual('', out)
523
522
 
524
 
    def test_status_with_shelves(self):
525
 
        """Ensure that _show_shelve_summary handler works.
526
 
        """
527
 
        wt = self.make_branch_and_tree('.')
528
 
        self.build_tree(['hello.c'])
529
 
        wt.add('hello.c')
530
 
        self.run_bzr(['shelve', '--all', '-m', 'foo'])
531
 
        self.build_tree(['bye.c'])
532
 
        wt.add('bye.c')
533
 
        # As TestCase.setUp clears all hooks, we install this default
534
 
        # post_status hook handler for the test.
535
 
        status.hooks.install_named_hook('post_status',
536
 
            status._show_shelve_summary,
537
 
            'bzr status')
538
 
        self.assertStatus([
539
 
                'added:\n',
540
 
                '  bye.c\n',
541
 
                '1 shelves exist. See "bzr shelve --list" for details.\n',
542
 
            ],
543
 
            wt)
544
 
 
545
523
 
546
524
class CheckoutStatus(BranchStatus):
547
525