← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-27 04:42:41 UTC
  • mfrom: (1092.1.43)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050827044241-23d676133b9fc981
Merge of robertc@robertcollins.net-20050826013321-52eee1f1da679ee9

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
24
24
from bzrlib.selftest import InTempDir
25
25
 
26
26
class BranchStatus(InTempDir):
27
 
    def runTest(self): 
 
27
    
 
28
    def test_branch_status(self): 
28
29
        """Basic 'bzr mkdir' operation"""
29
30
        from cStringIO import StringIO
30
31
        from bzrlib.status import show_status
39
40
 
40
41
        tof = StringIO()
41
42
        self.build_tree(['hello.c', 'bye.c'])
 
43
        b.add_pending_merge('pending@pending-0-0')
42
44
        show_status(b, to_file=tof)
43
45
        tof.seek(0)
44
46
        self.assertEquals(tof.readlines(),
45
47
                          ['unknown:\n',
46
48
                           '  bye.c\n',
47
49
                           '  hello.c\n',
 
50
                           'pending merges:\n',
 
51
                           '  pending@pending-0-0\n'
48
52
                           ])
49
53