~bzr-pqm/bzr/bzr.dev

768 by Martin Pool
- start some tests for directory renames
1
import os
2
import unittest
3
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
768 by Martin Pool
- start some tests for directory renames
5
from bzrlib.branch import ScratchBranch, Branch
778 by Martin Pool
- simple revert of text files
6
from bzrlib.errors import NotBranchError, NotVersionedError
7
8
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
9
class TestBranch(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
10
11
    def test_unknowns(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
12
        b = Branch.initialize('.')
781 by Martin Pool
- start of simple test for unknown-file reporting
13
14
        self.build_tree(['hello.txt',
15
                         'hello.txt~'])
16
17
        self.assertEquals(list(b.unknowns()),
18
                          ['hello.txt'])
19
1102 by Martin Pool
- merge test refactoring from robertc
20
    def test_no_changes(self):
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
21
        from bzrlib.errors import PointlessCommit
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
22
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
23
        b = Branch.initialize('.')
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
24
25
        self.build_tree(['hello.txt'])
26
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
27
        self.assertRaises(PointlessCommit,
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
28
                          b.commit,
29
                          'commit without adding',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
30
                          allow_pointless=False)
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
31
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
32
        b.commit('commit pointless tree',
33
                 allow_pointless=True)
883 by Martin Pool
- more tests for detecting empty commits
34
35
        b.add('hello.txt')
36
        
37
        b.commit('commit first added file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
38
                 allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
39
        
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
40
        self.assertRaises(PointlessCommit,
883 by Martin Pool
- more tests for detecting empty commits
41
                          b.commit,
42
                          'commit after adding file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
43
                          allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
44
        
45
        b.commit('commit pointless revision with one file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
46
                 allow_pointless=True)
883 by Martin Pool
- more tests for detecting empty commits
47
48
        
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
49
50
1102 by Martin Pool
- merge test refactoring from robertc
51
class TestRevisionId(TestCase):
52
    
53
    def test_validate_revision_id(self):
811 by Martin Pool
- Test case for validate_revision_id
54
        from bzrlib.revision import validate_revision_id
55
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
56
        self.assertRaises(ValueError,
57
                          validate_revision_id,
58
                          ' asdkjas')
59
        self.assertRaises(ValueError,
60
                          validate_revision_id,
61
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
62
        self.assertRaises(ValueError,
63
                          validate_revision_id,
64
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
65
        self.assertRaises(ValueError,
66
                          validate_revision_id,
67
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
68
69
1278 by Martin Pool
- remove test that tried to commit absent parents
70
class MoreTests(TestCaseInTempDir):
1390 by Robert Collins
pair programming worx... merge integration and weave
71
1102 by Martin Pool
- merge test refactoring from robertc
72
    def test_revert(self):
73
        """Test selected-file revert"""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
74
        b = Branch.initialize('.')
778 by Martin Pool
- simple revert of text files
75
76
        self.build_tree(['hello.txt'])
77
        file('hello.txt', 'w').write('initial hello')
78
79
        self.assertRaises(NotVersionedError,
80
                          b.revert, ['hello.txt'])
81
        
82
        b.add(['hello.txt'])
83
        b.commit('create initial hello.txt')
84
85
        self.check_file_contents('hello.txt', 'initial hello')
86
        file('hello.txt', 'w').write('new hello')
87
        self.check_file_contents('hello.txt', 'new hello')
88
89
        # revert file modified since last revision
90
        b.revert(['hello.txt'])
91
        self.check_file_contents('hello.txt', 'initial hello')
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
92
        self.check_file_contents('hello.txt~', 'new hello')
778 by Martin Pool
- simple revert of text files
93
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
94
        # reverting again clobbers the backup
778 by Martin Pool
- simple revert of text files
95
        b.revert(['hello.txt'])
96
        self.check_file_contents('hello.txt', 'initial hello')
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
97
        self.check_file_contents('hello.txt~', 'initial hello')
778 by Martin Pool
- simple revert of text files
98
1102 by Martin Pool
- merge test refactoring from robertc
99
    def test_rename_dirs(self):
100
        """Test renaming directories and the files within them."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
101
        b = Branch.initialize('.')
768 by Martin Pool
- start some tests for directory renames
102
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
103
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
104
105
        b.commit('create initial state')
106
107
        # TODO: lift out to a test helper that checks the shape of
108
        # an inventory
109
        
110
        revid = b.revision_history()[0]
111
        self.log('first revision_id is {%s}' % revid)
112
        
113
        inv = b.get_revision_inventory(revid)
114
        self.log('contents of inventory: %r' % inv.entries())
115
116
        self.check_inventory_shape(inv,
117
                                   ['dir', 'dir/sub', 'dir/sub/file'])
118
771 by Martin Pool
- more tests of directory renames
119
        b.rename_one('dir', 'newdir')
120
121
        self.check_inventory_shape(b.inventory,
122
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
123
124
        b.rename_one('newdir/sub', 'newdir/newsub')
125
        self.check_inventory_shape(b.inventory,
126
                                   ['newdir', 'newdir/newsub',
127
                                    'newdir/newsub/file'])
128
1102 by Martin Pool
- merge test refactoring from robertc
129
    def test_relpath(self):
130
        """test for branch path lookups
131
    
132
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
133
        job: given a path (either relative to cwd or absolute), work out
134
        if it is inside a branch and return the path relative to the base.
135
        """
601 by Martin Pool
- whitebox tests for branch path handling
136
        from bzrlib.branch import _relpath
137
        import tempfile, shutil
138
        
139
        savedir = os.getcwdu()
140
        dtmp = tempfile.mkdtemp()
907.1.7 by John Arbash Meinel
Fixed test failure on Mac OSX.
141
        # On Mac OSX, /tmp actually expands to /private/tmp
142
        dtmp = os.path.realpath(dtmp)
601 by Martin Pool
- whitebox tests for branch path handling
143
144
        def rp(p):
145
            return _relpath(dtmp, p)
146
        
147
        try:
148
            # check paths inside dtmp while standing outside it
149
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
150
151
            # root = nothing
152
            self.assertEqual(rp(dtmp), '')
153
154
            self.assertRaises(NotBranchError,
155
                              rp,
156
                              '/etc')
157
158
            # now some near-miss operations -- note that
159
            # os.path.commonprefix gets these wrong!
160
            self.assertRaises(NotBranchError,
161
                              rp,
162
                              dtmp.rstrip('\\/') + '2')
163
164
            self.assertRaises(NotBranchError,
165
                              rp,
166
                              dtmp.rstrip('\\/') + '2/foo')
167
168
            # now operations based on relpath of files in current
169
            # directory, or nearby
170
            os.chdir(dtmp)
171
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
172
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
173
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
601 by Martin Pool
- whitebox tests for branch path handling
174
175
            self.assertEqual(rp('foo'), 'foo')
176
177
            self.assertEqual(rp('./foo'), 'foo')
178
179
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
180
181
            self.assertRaises(NotBranchError,
182
                              rp, '../foo')
183
184
        finally:
185
            os.chdir(savedir)
186
            shutil.rmtree(dtmp)