← 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-09-13 02:11:41 UTC
  • Revision ID: mbp@sourcefrog.net-20050913021141-263bfc2655ac3ed2
- store inventories in weave

- put more intelligence into WeaveStore

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