← 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-07-04 12:11:40 UTC
  • Revision ID: mbp@sourcefrog.net-20050704121140-fc4ab493bedc2e2f
- Deferred patch that uses Python ndiff format.

  This highlights the changes within a line, which is rather nice.  But it also
  outputs the entire file, which is less good.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
1
#! /usr/bin/python
16
2
 
17
3
import os
18
4
import unittest
19
5
 
20
 
from bzrlib import (
21
 
    osutils,
22
 
    )
23
 
from bzrlib.tests import TestCaseWithTransport, TestCase
24
 
from bzrlib.branch import Branch
25
 
from bzrlib.errors import PathNotChild
26
 
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
27
 
 
28
 
 
29
 
class MoreTests(TestCaseWithTransport):
30
 
 
31
 
    def test_relpath(self):
32
 
        """test for branch path lookups
33
 
 
34
 
        bzrlib.osutils._relpath do a simple but subtle
35
 
        job: given a path (either relative to cwd or absolute), work out
36
 
        if it is inside a branch and return the path relative to the base.
37
 
        """
38
 
        import tempfile
39
 
 
 
6
from bzrlib.selftest import InTempDir, TestBase
 
7
from bzrlib.branch import ScratchBranch, Branch
 
8
from bzrlib.errors import NotBranchError, NotVersionedError
 
9
 
 
10
 
 
11
class Unknowns(InTempDir):
 
12
    def runTest(self):
 
13
        b = Branch('.', init=True)
 
14
 
 
15
        self.build_tree(['hello.txt',
 
16
                         'hello.txt~'])
 
17
 
 
18
        self.assertEquals(list(b.unknowns()),
 
19
                          ['hello.txt'])
 
20
 
 
21
 
 
22
 
 
23
class ValidateRevisionId(TestBase):
 
24
    def runTest(self):
 
25
        from bzrlib.revision import validate_revision_id
 
26
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
27
        
 
28
        self.assertRaises(ValueError,
 
29
                          validate_revision_id,
 
30
                          ' asdkjas')
 
31
 
 
32
 
 
33
        self.assertRaises(ValueError,
 
34
                          validate_revision_id,
 
35
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
36
 
 
37
 
 
38
        self.assertRaises(ValueError,
 
39
                          validate_revision_id,
 
40
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
41
 
 
42
        self.assertRaises(ValueError,
 
43
                          validate_revision_id,
 
44
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
 
45
 
 
46
 
 
47
 
 
48
class PendingMerges(InTempDir):
 
49
    """Tracking pending-merged revisions."""
 
50
    def runTest(self):
 
51
        b = Branch('.', init=True)
 
52
 
 
53
        self.assertEquals(b.pending_merges(), [])
 
54
        
 
55
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
56
        
 
57
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
58
    
 
59
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
60
        
 
61
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
62
 
 
63
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
64
        self.assertEquals(b.pending_merges(),
 
65
                          ['foo@azkhazan-123123-abcabc',
 
66
                           'wibble@fofof--20050401--1928390812'])
 
67
 
 
68
        b.commit("commit from base with two merges")
 
69
 
 
70
        rev = b.get_revision(b.revision_history()[0])
 
71
        self.assertEquals(len(rev.parents), 2)
 
72
        self.assertEquals(rev.parents[0].revision_id,
 
73
                          'foo@azkhazan-123123-abcabc')
 
74
        self.assertEquals(rev.parents[1].revision_id,
 
75
                           'wibble@fofof--20050401--1928390812')
 
76
        
 
77
        
 
78
 
 
79
class Revert(InTempDir):
 
80
    """Test selected-file revert"""
 
81
    def runTest(self):
 
82
        b = Branch('.', init=True)
 
83
 
 
84
        self.build_tree(['hello.txt'])
 
85
        file('hello.txt', 'w').write('initial hello')
 
86
 
 
87
        self.assertRaises(NotVersionedError,
 
88
                          b.revert, ['hello.txt'])
 
89
        
 
90
        b.add(['hello.txt'])
 
91
        b.commit('create initial hello.txt')
 
92
 
 
93
        self.check_file_contents('hello.txt', 'initial hello')
 
94
        file('hello.txt', 'w').write('new hello')
 
95
        self.check_file_contents('hello.txt', 'new hello')
 
96
 
 
97
        # revert file modified since last revision
 
98
        b.revert(['hello.txt'])
 
99
        self.check_file_contents('hello.txt', 'initial hello')
 
100
        self.check_file_contents('hello.txt~', 'new hello')
 
101
 
 
102
        # reverting again clobbers the backup
 
103
        b.revert(['hello.txt'])
 
104
        self.check_file_contents('hello.txt', 'initial hello')
 
105
        self.check_file_contents('hello.txt~', 'initial hello')
 
106
 
 
107
 
 
108
 
 
109
class RenameDirs(InTempDir):
 
110
    """Test renaming directories and the files within them."""
 
111
    def runTest(self):
 
112
        b = Branch('.', init=True)
 
113
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
 
114
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
 
115
 
 
116
        b.commit('create initial state')
 
117
 
 
118
        # TODO: lift out to a test helper that checks the shape of
 
119
        # an inventory
 
120
        
 
121
        revid = b.revision_history()[0]
 
122
        self.log('first revision_id is {%s}' % revid)
 
123
        
 
124
        inv = b.get_revision_inventory(revid)
 
125
        self.log('contents of inventory: %r' % inv.entries())
 
126
 
 
127
        self.check_inventory_shape(inv,
 
128
                                   ['dir', 'dir/sub', 'dir/sub/file'])
 
129
 
 
130
        b.rename_one('dir', 'newdir')
 
131
 
 
132
        self.check_inventory_shape(b.inventory,
 
133
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
 
134
 
 
135
        b.rename_one('newdir/sub', 'newdir/newsub')
 
136
        self.check_inventory_shape(b.inventory,
 
137
                                   ['newdir', 'newdir/newsub',
 
138
                                    'newdir/newsub/file'])
 
139
 
 
140
        
 
141
 
 
142
 
 
143
class BranchPathTestCase(TestBase):
 
144
    """test for branch path lookups
 
145
 
 
146
    Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
147
    job: given a path (either relative to cwd or absolute), work out
 
148
    if it is inside a branch and return the path relative to the base.
 
149
    """
 
150
 
 
151
    def runTest(self):
 
152
        from bzrlib.branch import _relpath
 
153
        import tempfile, shutil
 
154
        
40
155
        savedir = os.getcwdu()
41
 
        dtmp = osutils.mkdtemp()
42
 
        # On Mac OSX, /tmp actually expands to /private/tmp
43
 
        dtmp = realpath(dtmp)
 
156
        dtmp = tempfile.mkdtemp()
44
157
 
45
158
        def rp(p):
46
 
            return relpath(dtmp, p)
47
 
 
 
159
            return _relpath(dtmp, p)
 
160
        
48
161
        try:
49
162
            # check paths inside dtmp while standing outside it
50
 
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
 
163
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
51
164
 
52
165
            # root = nothing
53
166
            self.assertEqual(rp(dtmp), '')
54
167
 
55
 
            self.assertRaises(PathNotChild,
 
168
            self.assertRaises(NotBranchError,
56
169
                              rp,
57
170
                              '/etc')
58
171
 
59
172
            # now some near-miss operations -- note that
60
173
            # os.path.commonprefix gets these wrong!
61
 
            self.assertRaises(PathNotChild,
 
174
            self.assertRaises(NotBranchError,
62
175
                              rp,
63
176
                              dtmp.rstrip('\\/') + '2')
64
177
 
65
 
            self.assertRaises(PathNotChild,
 
178
            self.assertRaises(NotBranchError,
66
179
                              rp,
67
180
                              dtmp.rstrip('\\/') + '2/foo')
68
181
 
76
189
 
77
190
            self.assertEqual(rp('./foo'), 'foo')
78
191
 
79
 
            self.assertEqual(rp(abspath('foo')), 'foo')
 
192
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
80
193
 
81
 
            self.assertRaises(PathNotChild,
 
194
            self.assertRaises(NotBranchError,
82
195
                              rp, '../foo')
83
196
 
84
197
        finally:
85
198
            os.chdir(savedir)
86
 
            osutils.rmtree(dtmp)
 
199
            shutil.rmtree(dtmp)