/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
601 by Martin Pool
- whitebox tests for branch path handling
1
#! /usr/bin/python
2
768 by Martin Pool
- start some tests for directory renames
3
import os
4
import unittest
5
1092.1.2 by Robert Collins
switch testsweet.TestBase to TestCase which is convention for xUnit
6
from bzrlib.selftest import InTempDir, TestCase
768 by Martin Pool
- start some tests for directory renames
7
from bzrlib.branch import ScratchBranch, Branch
778 by Martin Pool
- simple revert of text files
8
from bzrlib.errors import NotBranchError, NotVersionedError
9
10
1092.1.15 by Robert Collins
finish flushing runTest idiom
11
class TestBranch(InTempDir):
12
13
    def test_unknowns(self):
781 by Martin Pool
- start of simple test for unknown-file reporting
14
        b = Branch('.', init=True)
15
16
        self.build_tree(['hello.txt',
17
                         'hello.txt~'])
18
19
        self.assertEquals(list(b.unknowns()),
20
                          ['hello.txt'])
21
1092.1.15 by Robert Collins
finish flushing runTest idiom
22
    def test_no_changes(self):
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
23
        from bzrlib.errors import PointlessCommit
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
24
        
25
        b = Branch('.', init=True)
26
27
        self.build_tree(['hello.txt'])
28
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
29
        self.assertRaises(PointlessCommit,
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
30
                          b.commit,
31
                          'commit without adding',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
32
                          allow_pointless=False)
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
33
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
34
        b.commit('commit pointless tree',
35
                 allow_pointless=True)
883 by Martin Pool
- more tests for detecting empty commits
36
37
        b.add('hello.txt')
38
        
39
        b.commit('commit first added file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
40
                 allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
41
        
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
42
        self.assertRaises(PointlessCommit,
883 by Martin Pool
- more tests for detecting empty commits
43
                          b.commit,
44
                          'commit after adding file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
45
                          allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
46
        
47
        b.commit('commit pointless revision with one file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
48
                 allow_pointless=True)
883 by Martin Pool
- more tests for detecting empty commits
49
50
        b.add_pending_merge('mbp@892739123-2005-123123')
51
        b.commit('commit new merge with no text changes',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
52
                 allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
53
        
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
54
55
1092.1.15 by Robert Collins
finish flushing runTest idiom
56
class TestRevisionId(TestCase):
57
    
58
    def test_validate_revision_id(self):
811 by Martin Pool
- Test case for validate_revision_id
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
815 by Martin Pool
- track pending-merges
75
class PendingMerges(InTempDir):
1092.1.15 by Robert Collins
finish flushing runTest idiom
76
    def test_pending_merges(self):
77
        """Tracking pending-merged revisions."""
815 by Martin Pool
- track pending-merges
78
        b = Branch('.', init=True)
79
        self.assertEquals(b.pending_merges(), [])
1092.1.16 by Robert Collins
provide a helper to redirect output as desired
80
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
81
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
82
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
815 by Martin Pool
- track pending-merges
84
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
85
        self.assertEquals(b.pending_merges(),
86
                          ['foo@azkhazan-123123-abcabc',
87
                           'wibble@fofof--20050401--1928390812'])
816 by Martin Pool
- don't write precursor field in new revision xml
88
        b.commit("commit from base with two merges")
89
        rev = b.get_revision(b.revision_history()[0])
90
        self.assertEquals(len(rev.parents), 2)
91
        self.assertEquals(rev.parents[0].revision_id,
92
                          'foo@azkhazan-123123-abcabc')
93
        self.assertEquals(rev.parents[1].revision_id,
94
                           'wibble@fofof--20050401--1928390812')
818 by Martin Pool
- Clear pending-merge list when committing.
95
        # list should be cleared when we do a commit
96
        self.assertEquals(b.pending_merges(), [])
97
        
1092.1.15 by Robert Collins
finish flushing runTest idiom
98
    def test_revert(self):
99
        """Test selected-file revert"""
778 by Martin Pool
- simple revert of text files
100
        b = Branch('.', init=True)
101
102
        self.build_tree(['hello.txt'])
103
        file('hello.txt', 'w').write('initial hello')
104
105
        self.assertRaises(NotVersionedError,
106
                          b.revert, ['hello.txt'])
107
        
108
        b.add(['hello.txt'])
109
        b.commit('create initial hello.txt')
110
111
        self.check_file_contents('hello.txt', 'initial hello')
112
        file('hello.txt', 'w').write('new hello')
113
        self.check_file_contents('hello.txt', 'new hello')
114
115
        # revert file modified since last revision
116
        b.revert(['hello.txt'])
117
        self.check_file_contents('hello.txt', 'initial hello')
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
118
        self.check_file_contents('hello.txt~', 'new hello')
778 by Martin Pool
- simple revert of text files
119
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
120
        # reverting again clobbers the backup
778 by Martin Pool
- simple revert of text files
121
        b.revert(['hello.txt'])
122
        self.check_file_contents('hello.txt', 'initial hello')
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
123
        self.check_file_contents('hello.txt~', 'initial hello')
778 by Martin Pool
- simple revert of text files
124
1092.1.15 by Robert Collins
finish flushing runTest idiom
125
    def test_rename_dirs(self):
126
        """Test renaming directories and the files within them."""
768 by Martin Pool
- start some tests for directory renames
127
        b = Branch('.', init=True)
128
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
129
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
130
131
        b.commit('create initial state')
132
133
        # TODO: lift out to a test helper that checks the shape of
134
        # an inventory
135
        
136
        revid = b.revision_history()[0]
137
        self.log('first revision_id is {%s}' % revid)
138
        
139
        inv = b.get_revision_inventory(revid)
140
        self.log('contents of inventory: %r' % inv.entries())
141
142
        self.check_inventory_shape(inv,
143
                                   ['dir', 'dir/sub', 'dir/sub/file'])
144
771 by Martin Pool
- more tests of directory renames
145
        b.rename_one('dir', 'newdir')
146
147
        self.check_inventory_shape(b.inventory,
148
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
149
150
        b.rename_one('newdir/sub', 'newdir/newsub')
151
        self.check_inventory_shape(b.inventory,
152
                                   ['newdir', 'newdir/newsub',
153
                                    'newdir/newsub/file'])
154
1092.1.15 by Robert Collins
finish flushing runTest idiom
155
    def test_relpath(self):
156
        """test for branch path lookups
157
    
158
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
159
        job: given a path (either relative to cwd or absolute), work out
160
        if it is inside a branch and return the path relative to the base.
161
        """
601 by Martin Pool
- whitebox tests for branch path handling
162
        from bzrlib.branch import _relpath
163
        import tempfile, shutil
164
        
165
        savedir = os.getcwdu()
166
        dtmp = tempfile.mkdtemp()
910 by Martin Pool
patch from John
167
        # On Mac OSX, /tmp actually expands to /private/tmp
168
        dtmp = os.path.realpath(dtmp)
601 by Martin Pool
- whitebox tests for branch path handling
169
170
        def rp(p):
171
            return _relpath(dtmp, p)
172
        
173
        try:
174
            # check paths inside dtmp while standing outside it
175
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
176
177
            # root = nothing
178
            self.assertEqual(rp(dtmp), '')
179
180
            self.assertRaises(NotBranchError,
181
                              rp,
182
                              '/etc')
183
184
            # now some near-miss operations -- note that
185
            # os.path.commonprefix gets these wrong!
186
            self.assertRaises(NotBranchError,
187
                              rp,
188
                              dtmp.rstrip('\\/') + '2')
189
190
            self.assertRaises(NotBranchError,
191
                              rp,
192
                              dtmp.rstrip('\\/') + '2/foo')
193
194
            # now operations based on relpath of files in current
195
            # directory, or nearby
196
            os.chdir(dtmp)
197
198
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
199
200
            self.assertEqual(rp('foo'), 'foo')
201
202
            self.assertEqual(rp('./foo'), 'foo')
203
204
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
205
206
            self.assertRaises(NotBranchError,
207
                              rp, '../foo')
208
209
        finally:
210
            os.chdir(savedir)
211
            shutil.rmtree(dtmp)