← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_whitebox.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-14 16:16:53 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1919.
  • Revision ID: john@arbash-meinel.com-20060814161653-54cdcdadcd4e9003
Remove bogus entry from BRANCH.TODO

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_whitebox.py
1
 
#! /usr/bin/python
 
1
# Copyright (C) 2005, 2006 by 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
2
16
 
3
17
import os
4
18
import unittest
5
19
 
6
 
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
 
from bzrlib.branch import ScratchBranch, Branch
8
 
from bzrlib.errors import NotBranchError, NotVersionedError
9
 
 
10
 
 
11
 
class TestBranch(TestCaseInTempDir):
12
 
 
13
 
    def test_unknowns(self):
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
 
 
22
 
    def test_no_changes(self):
23
 
        from bzrlib.errors import PointlessCommit
24
 
        
25
 
        b = Branch('.', init=True)
26
 
        self.build_tree(['hello.txt'])
27
 
 
28
 
        self.assertRaises(PointlessCommit,
29
 
                          b.commit,
30
 
                          'commit without adding',
31
 
                          allow_pointless=False)
32
 
 
33
 
        b.commit('commit pointless tree',
34
 
                 allow_pointless=True)
35
 
 
36
 
        b.add('hello.txt')
37
 
        
38
 
        b.commit('commit first added file',
39
 
                 allow_pointless=False)
40
 
        
41
 
        self.assertRaises(PointlessCommit,
42
 
                          b.commit,
43
 
                          'commit after adding file',
44
 
                          allow_pointless=False)
45
 
        
46
 
        b.commit('commit pointless revision with one file',
47
 
                 allow_pointless=True)
48
 
 
49
 
        
50
 
 
51
 
 
52
 
class TestRevisionId(TestCase):
53
 
    
54
 
    def test_validate_revision_id(self):
55
 
        from bzrlib.revision import validate_revision_id
56
 
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
57
 
        self.assertRaises(ValueError,
58
 
                          validate_revision_id,
59
 
                          ' asdkjas')
60
 
        self.assertRaises(ValueError,
61
 
                          validate_revision_id,
62
 
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
63
 
        self.assertRaises(ValueError,
64
 
                          validate_revision_id,
65
 
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
66
 
        self.assertRaises(ValueError,
67
 
                          validate_revision_id,
68
 
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
69
 
 
70
 
 
71
 
class MoreTests(TestCaseInTempDir):
72
 
    def test_revert(self):
73
 
        """Test selected-file revert"""
74
 
        b = Branch('.', init=True)
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('.', init=True)
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'])
 
20
from bzrlib.tests import TestCaseWithTransport, TestCase
 
21
from bzrlib.branch import Branch
 
22
from bzrlib.errors import PathNotChild
 
23
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
 
24
 
 
25
 
 
26
class MoreTests(TestCaseWithTransport):
128
27
 
129
28
    def test_relpath(self):
130
29
        """test for branch path lookups
131
30
    
132
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
31
        bzrlib.osutils._relpath do a simple but subtle
133
32
        job: given a path (either relative to cwd or absolute), work out
134
33
        if it is inside a branch and return the path relative to the base.
135
34
        """
136
 
        from bzrlib.branch import _relpath
137
 
        import tempfile, shutil
 
35
        import tempfile
 
36
        from bzrlib.osutils import rmtree
138
37
        
139
38
        savedir = os.getcwdu()
140
39
        dtmp = tempfile.mkdtemp()
141
40
        # On Mac OSX, /tmp actually expands to /private/tmp
142
 
        dtmp = os.path.realpath(dtmp)
 
41
        dtmp = realpath(dtmp)
143
42
 
144
43
        def rp(p):
145
 
            return _relpath(dtmp, p)
 
44
            return relpath(dtmp, p)
146
45
        
147
46
        try:
148
47
            # check paths inside dtmp while standing outside it
149
 
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
 
48
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
150
49
 
151
50
            # root = nothing
152
51
            self.assertEqual(rp(dtmp), '')
153
52
 
154
 
            self.assertRaises(NotBranchError,
 
53
            self.assertRaises(PathNotChild,
155
54
                              rp,
156
55
                              '/etc')
157
56
 
158
57
            # now some near-miss operations -- note that
159
58
            # os.path.commonprefix gets these wrong!
160
 
            self.assertRaises(NotBranchError,
 
59
            self.assertRaises(PathNotChild,
161
60
                              rp,
162
61
                              dtmp.rstrip('\\/') + '2')
163
62
 
164
 
            self.assertRaises(NotBranchError,
 
63
            self.assertRaises(PathNotChild,
165
64
                              rp,
166
65
                              dtmp.rstrip('\\/') + '2/foo')
167
66
 
175
74
 
176
75
            self.assertEqual(rp('./foo'), 'foo')
177
76
 
178
 
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
 
77
            self.assertEqual(rp(abspath('foo')), 'foo')
179
78
 
180
 
            self.assertRaises(NotBranchError,
 
79
            self.assertRaises(PathNotChild,
181
80
                              rp, '../foo')
182
81
 
183
82
        finally:
184
83
            os.chdir(savedir)
185
 
            shutil.rmtree(dtmp)
 
84
            rmtree(dtmp)