← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Robert Collins
  • Date: 2005-10-03 01:15:02 UTC
  • mfrom: (1092.2.28)
  • Revision ID: robertc@robertcollins.net-20051003011502-f579a509a136b774
merge from baz2bzr

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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
1
import os
18
2
import unittest
19
3
 
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):
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
 
5
from bzrlib.branch import ScratchBranch, Branch
 
6
from bzrlib.errors import NotBranchError, NotVersionedError
 
7
 
 
8
 
 
9
class TestBranch(TestCaseInTempDir):
 
10
 
 
11
    def test_unknowns(self):
 
12
        b = Branch.initialize('.')
 
13
 
 
14
        self.build_tree(['hello.txt',
 
15
                         'hello.txt~'])
 
16
 
 
17
        self.assertEquals(list(b.unknowns()),
 
18
                          ['hello.txt'])
 
19
 
 
20
    def test_no_changes(self):
 
21
        from bzrlib.errors import PointlessCommit
 
22
        
 
23
        b = Branch.initialize('.')
 
24
 
 
25
        self.build_tree(['hello.txt'])
 
26
 
 
27
        self.assertRaises(PointlessCommit,
 
28
                          b.commit,
 
29
                          'commit without adding',
 
30
                          allow_pointless=False)
 
31
 
 
32
        b.commit('commit pointless tree',
 
33
                 allow_pointless=True)
 
34
 
 
35
        b.add('hello.txt')
 
36
        
 
37
        b.commit('commit first added file',
 
38
                 allow_pointless=False)
 
39
        
 
40
        self.assertRaises(PointlessCommit,
 
41
                          b.commit,
 
42
                          'commit after adding file',
 
43
                          allow_pointless=False)
 
44
        
 
45
        b.commit('commit pointless revision with one file',
 
46
                 allow_pointless=True)
 
47
 
 
48
        
 
49
 
 
50
 
 
51
class TestRevisionId(TestCase):
 
52
    
 
53
    def test_validate_revision_id(self):
 
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
 
 
70
class MoreTests(TestCaseInTempDir):
 
71
 
 
72
    def test_revert(self):
 
73
        """Test selected-file revert"""
 
74
        b = Branch.initialize('.')
 
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')
 
92
        self.check_file_contents('hello.txt~', 'new hello')
 
93
 
 
94
        # reverting again clobbers the backup
 
95
        b.revert(['hello.txt'])
 
96
        self.check_file_contents('hello.txt', 'initial hello')
 
97
        self.check_file_contents('hello.txt~', 'initial hello')
 
98
 
 
99
    def test_rename_dirs(self):
 
100
        """Test renaming directories and the files within them."""
 
101
        b = Branch.initialize('.')
 
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
 
 
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'])
30
128
 
31
129
    def test_relpath(self):
32
130
        """test for branch path lookups
33
131
    
34
 
        bzrlib.osutils._relpath do a simple but subtle
 
132
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
35
133
        job: given a path (either relative to cwd or absolute), work out
36
134
        if it is inside a branch and return the path relative to the base.
37
135
        """
38
 
        import tempfile
39
 
 
 
136
        from bzrlib.branch import _relpath
 
137
        import tempfile, shutil
 
138
        
40
139
        savedir = os.getcwdu()
41
 
        dtmp = osutils.mkdtemp()
 
140
        dtmp = tempfile.mkdtemp()
42
141
        # On Mac OSX, /tmp actually expands to /private/tmp
43
 
        dtmp = realpath(dtmp)
 
142
        dtmp = os.path.realpath(dtmp)
44
143
 
45
144
        def rp(p):
46
 
            return relpath(dtmp, p)
47
 
 
 
145
            return _relpath(dtmp, p)
 
146
        
48
147
        try:
49
148
            # check paths inside dtmp while standing outside it
50
 
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
 
149
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
51
150
 
52
151
            # root = nothing
53
152
            self.assertEqual(rp(dtmp), '')
54
153
 
55
 
            self.assertRaises(PathNotChild,
 
154
            self.assertRaises(NotBranchError,
56
155
                              rp,
57
156
                              '/etc')
58
157
 
59
158
            # now some near-miss operations -- note that
60
159
            # os.path.commonprefix gets these wrong!
61
 
            self.assertRaises(PathNotChild,
 
160
            self.assertRaises(NotBranchError,
62
161
                              rp,
63
162
                              dtmp.rstrip('\\/') + '2')
64
163
 
65
 
            self.assertRaises(PathNotChild,
 
164
            self.assertRaises(NotBranchError,
66
165
                              rp,
67
166
                              dtmp.rstrip('\\/') + '2/foo')
68
167
 
70
169
            # directory, or nearby
71
170
            os.chdir(dtmp)
72
171
 
73
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
172
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
173
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
74
174
 
75
175
            self.assertEqual(rp('foo'), 'foo')
76
176
 
77
177
            self.assertEqual(rp('./foo'), 'foo')
78
178
 
79
 
            self.assertEqual(rp(abspath('foo')), 'foo')
 
179
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
80
180
 
81
 
            self.assertRaises(PathNotChild,
 
181
            self.assertRaises(NotBranchError,
82
182
                              rp, '../foo')
83
183
 
84
184
        finally:
85
185
            os.chdir(savedir)
86
 
            osutils.rmtree(dtmp)
 
186
            shutil.rmtree(dtmp)