← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

- merge improved merge base selection from aaron
aaron.bentley@utoronto.ca-20050912025534-43d7275dd948e4ad

Show diffs side-by-side

added added

removed removed

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