← 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-08-26 02:31:37 UTC
  • Revision ID: mbp@sourcefrog.net-20050826023137-eb4b101cc92f9792
- ignore tags files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
3
3
import os
4
4
import unittest
5
5
 
6
 
from bzrlib.selftest import TestCaseInTempDir, TestCase
 
6
from bzrlib.selftest import InTempDir, TestCase
7
7
from bzrlib.branch import ScratchBranch, Branch
8
8
from bzrlib.errors import NotBranchError, NotVersionedError
9
9
 
10
10
 
11
 
class TestBranch(TestCaseInTempDir):
 
11
class TestBranch(InTempDir):
12
12
 
13
13
    def test_unknowns(self):
14
14
        b = Branch('.', init=True)
72
72
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
73
73
 
74
74
 
75
 
class PendingMerges(TestCaseInTempDir):
76
 
 
 
75
class PendingMerges(InTempDir):
77
76
    def test_pending_merges(self):
78
77
        """Tracking pending-merged revisions."""
79
78
        b = Branch('.', init=True)
80
79
 
81
80
        self.assertEquals(b.pending_merges(), [])
82
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
85
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
81
        
 
82
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
83
        
 
84
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
85
    
 
86
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
87
        
 
88
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
89
 
86
90
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
87
91
        self.assertEquals(b.pending_merges(),
88
92
                          ['foo@azkhazan-123123-abcabc',
89
93
                           'wibble@fofof--20050401--1928390812'])
 
94
 
90
95
        b.commit("commit from base with two merges")
 
96
 
91
97
        rev = b.get_revision(b.revision_history()[0])
92
98
        self.assertEquals(len(rev.parents), 2)
93
99
        self.assertEquals(rev.parents[0].revision_id,
94
100
                          'foo@azkhazan-123123-abcabc')
95
101
        self.assertEquals(rev.parents[1].revision_id,
96
102
                           'wibble@fofof--20050401--1928390812')
 
103
 
97
104
        # list should be cleared when we do a commit
98
105
        self.assertEquals(b.pending_merges(), [])
99
106
        
211
218
        finally:
212
219
            os.chdir(savedir)
213
220
            shutil.rmtree(dtmp)
 
221
 
 
222
 
 
223
TEST_CLASSES = [TestBranch,
 
224
                TestRevisionId,
 
225
                PendingMerges
 
226
                ]