← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-07-04 08:06:51 UTC
  • Revision ID: mbp@sourcefrog.net-20050704080651-6ecec49164359e48
- track pending-merges

- unit tests for this

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
45
45
 
46
46
 
47
47
 
 
48
class PendingMerges(InTempDir):
 
49
    """Tracking pending-merged revisions."""
 
50
    def runTest(self):
 
51
        b = Branch('.', init=True)
 
52
 
 
53
        self.assertEquals(b.pending_merges(), [])
 
54
        
 
55
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
56
        
 
57
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
58
    
 
59
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
60
        
 
61
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
62
 
 
63
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
64
        self.assertEquals(b.pending_merges(),
 
65
                          ['foo@azkhazan-123123-abcabc',
 
66
                           'wibble@fofof--20050401--1928390812'])
 
67
        
 
68
 
48
69
class Revert(InTempDir):
49
70
    """Test selected-file revert"""
50
71
    def runTest(self):