← 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-09-16 08:23:10 UTC
  • Revision ID: mbp@sourcefrog.net-20050916082310-ecb5a25c40253839
- wrap wide strings when showing exceptions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
 
1
#! /usr/bin/python
 
2
 
1
3
import os
2
4
import unittest
3
5
 
4
 
from bzrlib.tests import TestCaseWithTransport, TestCase
 
6
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
7
from bzrlib.branch import ScratchBranch, Branch
6
 
from bzrlib.errors import PathNotChild
7
 
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
8
 
 
9
 
 
10
 
class MoreTests(TestCaseWithTransport):
 
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'])
11
128
 
12
129
    def test_relpath(self):
13
130
        """test for branch path lookups
14
131
    
15
 
        bzrlib.osutils._relpath do a simple but subtle
 
132
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
16
133
        job: given a path (either relative to cwd or absolute), work out
17
134
        if it is inside a branch and return the path relative to the base.
18
135
        """
19
 
        import tempfile
20
 
        from bzrlib.osutils import rmtree
 
136
        from bzrlib.branch import _relpath
 
137
        import tempfile, shutil
21
138
        
22
139
        savedir = os.getcwdu()
23
140
        dtmp = tempfile.mkdtemp()
24
141
        # On Mac OSX, /tmp actually expands to /private/tmp
25
 
        dtmp = realpath(dtmp)
 
142
        dtmp = os.path.realpath(dtmp)
26
143
 
27
144
        def rp(p):
28
 
            return relpath(dtmp, p)
 
145
            return _relpath(dtmp, p)
29
146
        
30
147
        try:
31
148
            # check paths inside dtmp while standing outside it
32
 
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
 
149
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
33
150
 
34
151
            # root = nothing
35
152
            self.assertEqual(rp(dtmp), '')
36
153
 
37
 
            self.assertRaises(PathNotChild,
 
154
            self.assertRaises(NotBranchError,
38
155
                              rp,
39
156
                              '/etc')
40
157
 
41
158
            # now some near-miss operations -- note that
42
159
            # os.path.commonprefix gets these wrong!
43
 
            self.assertRaises(PathNotChild,
 
160
            self.assertRaises(NotBranchError,
44
161
                              rp,
45
162
                              dtmp.rstrip('\\/') + '2')
46
163
 
47
 
            self.assertRaises(PathNotChild,
 
164
            self.assertRaises(NotBranchError,
48
165
                              rp,
49
166
                              dtmp.rstrip('\\/') + '2/foo')
50
167
 
58
175
 
59
176
            self.assertEqual(rp('./foo'), 'foo')
60
177
 
61
 
            self.assertEqual(rp(abspath('foo')), 'foo')
 
178
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
62
179
 
63
 
            self.assertRaises(PathNotChild,
 
180
            self.assertRaises(NotBranchError,
64
181
                              rp, '../foo')
65
182
 
66
183
        finally:
67
184
            os.chdir(savedir)
68
 
            rmtree(dtmp)
 
185
            shutil.rmtree(dtmp)