← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

Refactored the export code to make it easier to add new export formats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
1
 
#! /usr/bin/python
2
 
 
3
1
import os
4
2
import unittest
5
3
 
6
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
5
from bzrlib.branch import ScratchBranch, Branch
8
 
from bzrlib.errors import NotBranchError, NotVersionedError
 
6
from bzrlib.errors import NotBranchError
9
7
 
10
8
 
11
9
class TestBranch(TestCaseInTempDir):
27
25
        self.build_tree(['hello.txt'])
28
26
 
29
27
        self.assertRaises(PointlessCommit,
30
 
                          b.commit,
 
28
                          b.working_tree().commit,
31
29
                          'commit without adding',
32
30
                          allow_pointless=False)
33
31
 
34
 
        b.commit('commit pointless tree',
 
32
        b.working_tree().commit('commit pointless tree',
35
33
                 allow_pointless=True)
36
34
 
37
35
        b.add('hello.txt')
38
36
        
39
 
        b.commit('commit first added file',
 
37
        b.working_tree().commit('commit first added file',
40
38
                 allow_pointless=False)
41
39
        
42
40
        self.assertRaises(PointlessCommit,
43
 
                          b.commit,
 
41
                          b.working_tree().commit,
44
42
                          'commit after adding file',
45
43
                          allow_pointless=False)
46
44
        
47
 
        b.commit('commit pointless revision with one file',
 
45
        b.working_tree().commit('commit pointless revision with one file',
48
46
                 allow_pointless=True)
49
47
 
50
 
        b.add_pending_merge('mbp@892739123-2005-123123')
51
 
        b.commit('commit new merge with no text changes',
52
 
                 allow_pointless=False)
53
 
        
54
 
 
55
 
 
56
 
class TestRevisionId(TestCase):
57
 
    
58
 
    def test_validate_revision_id(self):
59
 
        from bzrlib.revision import validate_revision_id
60
 
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
61
 
        self.assertRaises(ValueError,
62
 
                          validate_revision_id,
63
 
                          ' asdkjas')
64
 
        self.assertRaises(ValueError,
65
 
                          validate_revision_id,
66
 
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
67
 
        self.assertRaises(ValueError,
68
 
                          validate_revision_id,
69
 
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
70
 
        self.assertRaises(ValueError,
71
 
                          validate_revision_id,
72
 
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
73
 
 
74
 
 
75
 
class PendingMerges(TestCaseInTempDir):
76
 
 
77
 
    def test_pending_merges(self):
78
 
        """Tracking pending-merged revisions."""
79
 
        b = Branch.initialize('.')
80
 
 
81
 
        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'])
86
 
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
87
 
        self.assertEquals(b.pending_merges(),
88
 
                          ['foo@azkhazan-123123-abcabc',
89
 
                           'wibble@fofof--20050401--1928390812'])
90
 
        b.commit("commit from base with two merges")
91
 
        rev = b.get_revision(b.revision_history()[0])
92
 
        self.assertEquals(len(rev.parents), 2)
93
 
        self.assertEquals(rev.parents[0].revision_id,
94
 
                          'foo@azkhazan-123123-abcabc')
95
 
        self.assertEquals(rev.parents[1].revision_id,
96
 
                           'wibble@fofof--20050401--1928390812')
97
 
        # list should be cleared when we do a commit
98
 
        self.assertEquals(b.pending_merges(), [])
99
 
        
100
 
    def test_revert(self):
101
 
        """Test selected-file revert"""
102
 
        b = Branch.initialize('.')
103
 
 
104
 
        self.build_tree(['hello.txt'])
105
 
        file('hello.txt', 'w').write('initial hello')
106
 
 
107
 
        self.assertRaises(NotVersionedError,
108
 
                          b.revert, ['hello.txt'])
109
 
        
110
 
        b.add(['hello.txt'])
111
 
        b.commit('create initial hello.txt')
112
 
 
113
 
        self.check_file_contents('hello.txt', 'initial hello')
114
 
        file('hello.txt', 'w').write('new hello')
115
 
        self.check_file_contents('hello.txt', 'new hello')
116
 
 
117
 
        # revert file modified since last revision
118
 
        b.revert(['hello.txt'])
119
 
        self.check_file_contents('hello.txt', 'initial hello')
120
 
        self.check_file_contents('hello.txt~', 'new hello')
121
 
 
122
 
        # reverting again clobbers the backup
123
 
        b.revert(['hello.txt'])
124
 
        self.check_file_contents('hello.txt', 'initial hello')
125
 
        self.check_file_contents('hello.txt~', 'initial hello')
 
48
 
 
49
class MoreTests(TestCaseInTempDir):
126
50
 
127
51
    def test_rename_dirs(self):
128
52
        """Test renaming directories and the files within them."""
130
54
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
131
55
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
132
56
 
133
 
        b.commit('create initial state')
 
57
        b.working_tree().commit('create initial state')
134
58
 
135
59
        # TODO: lift out to a test helper that checks the shape of
136
60
        # an inventory
146
70
 
147
71
        b.rename_one('dir', 'newdir')
148
72
 
149
 
        self.check_inventory_shape(b.inventory,
 
73
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
150
74
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
151
75
 
152
76
        b.rename_one('newdir/sub', 'newdir/newsub')
153
 
        self.check_inventory_shape(b.inventory,
 
77
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
154
78
                                   ['newdir', 'newdir/newsub',
155
79
                                    'newdir/newsub/file'])
156
80
 
157
81
    def test_relpath(self):
158
82
        """test for branch path lookups
159
83
    
160
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
84
        bzrlib.osutils._relpath do a simple but subtle
161
85
        job: given a path (either relative to cwd or absolute), work out
162
86
        if it is inside a branch and return the path relative to the base.
163
87
        """
164
 
        from bzrlib.branch import _relpath
 
88
        from bzrlib.osutils import relpath
165
89
        import tempfile, shutil
166
90
        
167
91
        savedir = os.getcwdu()
170
94
        dtmp = os.path.realpath(dtmp)
171
95
 
172
96
        def rp(p):
173
 
            return _relpath(dtmp, p)
 
97
            return relpath(dtmp, p)
174
98
        
175
99
        try:
176
100
            # check paths inside dtmp while standing outside it
197
121
            # directory, or nearby
198
122
            os.chdir(dtmp)
199
123
 
200
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
124
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
125
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
201
126
 
202
127
            self.assertEqual(rp('foo'), 'foo')
203
128