← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

- refactor handling of short option names

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
1
1
import os
2
2
import unittest
3
3
 
4
 
from bzrlib.tests import TestCaseWithTransport, TestCase
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
5
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):
 
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
class MoreTests(TestCaseInTempDir):
 
50
 
 
51
    def test_revert(self):
 
52
        """Test selected-file revert"""
 
53
        b = Branch.initialize('.')
 
54
 
 
55
        self.build_tree(['hello.txt'])
 
56
        file('hello.txt', 'w').write('initial hello')
 
57
 
 
58
        self.assertRaises(NotVersionedError,
 
59
                          b.revert, ['hello.txt'])
 
60
        
 
61
        b.add(['hello.txt'])
 
62
        b.commit('create initial hello.txt')
 
63
 
 
64
        self.check_file_contents('hello.txt', 'initial hello')
 
65
        file('hello.txt', 'w').write('new hello')
 
66
        self.check_file_contents('hello.txt', 'new hello')
 
67
 
 
68
        # revert file modified since last revision
 
69
        b.revert(['hello.txt'])
 
70
        self.check_file_contents('hello.txt', 'initial hello')
 
71
        self.check_file_contents('hello.txt~', 'new hello')
 
72
 
 
73
        # reverting again clobbers the backup
 
74
        b.revert(['hello.txt'])
 
75
        self.check_file_contents('hello.txt', 'initial hello')
 
76
        self.check_file_contents('hello.txt~', 'initial hello')
 
77
 
 
78
    def test_rename_dirs(self):
 
79
        """Test renaming directories and the files within them."""
 
80
        b = Branch.initialize('.')
 
81
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
 
82
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
 
83
 
 
84
        b.commit('create initial state')
 
85
 
 
86
        # TODO: lift out to a test helper that checks the shape of
 
87
        # an inventory
 
88
        
 
89
        revid = b.revision_history()[0]
 
90
        self.log('first revision_id is {%s}' % revid)
 
91
        
 
92
        inv = b.get_revision_inventory(revid)
 
93
        self.log('contents of inventory: %r' % inv.entries())
 
94
 
 
95
        self.check_inventory_shape(inv,
 
96
                                   ['dir', 'dir/sub', 'dir/sub/file'])
 
97
 
 
98
        b.rename_one('dir', 'newdir')
 
99
 
 
100
        self.check_inventory_shape(b.inventory,
 
101
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
 
102
 
 
103
        b.rename_one('newdir/sub', 'newdir/newsub')
 
104
        self.check_inventory_shape(b.inventory,
 
105
                                   ['newdir', 'newdir/newsub',
 
106
                                    'newdir/newsub/file'])
11
107
 
12
108
    def test_relpath(self):
13
109
        """test for branch path lookups
14
110
    
15
 
        bzrlib.osutils._relpath do a simple but subtle
 
111
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
16
112
        job: given a path (either relative to cwd or absolute), work out
17
113
        if it is inside a branch and return the path relative to the base.
18
114
        """
 
115
        from bzrlib.branch import _relpath
19
116
        import tempfile, shutil
20
117
        
21
118
        savedir = os.getcwdu()
22
119
        dtmp = tempfile.mkdtemp()
23
120
        # On Mac OSX, /tmp actually expands to /private/tmp
24
 
        dtmp = realpath(dtmp)
 
121
        dtmp = os.path.realpath(dtmp)
25
122
 
26
123
        def rp(p):
27
 
            return relpath(dtmp, p)
 
124
            return _relpath(dtmp, p)
28
125
        
29
126
        try:
30
127
            # check paths inside dtmp while standing outside it
31
 
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
 
128
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
32
129
 
33
130
            # root = nothing
34
131
            self.assertEqual(rp(dtmp), '')
35
132
 
36
 
            self.assertRaises(PathNotChild,
 
133
            self.assertRaises(NotBranchError,
37
134
                              rp,
38
135
                              '/etc')
39
136
 
40
137
            # now some near-miss operations -- note that
41
138
            # os.path.commonprefix gets these wrong!
42
 
            self.assertRaises(PathNotChild,
 
139
            self.assertRaises(NotBranchError,
43
140
                              rp,
44
141
                              dtmp.rstrip('\\/') + '2')
45
142
 
46
 
            self.assertRaises(PathNotChild,
 
143
            self.assertRaises(NotBranchError,
47
144
                              rp,
48
145
                              dtmp.rstrip('\\/') + '2/foo')
49
146
 
51
148
            # directory, or nearby
52
149
            os.chdir(dtmp)
53
150
 
54
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
151
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
152
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
55
153
 
56
154
            self.assertEqual(rp('foo'), 'foo')
57
155
 
58
156
            self.assertEqual(rp('./foo'), 'foo')
59
157
 
60
 
            self.assertEqual(rp(abspath('foo')), 'foo')
 
158
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
61
159
 
62
 
            self.assertRaises(PathNotChild,
 
160
            self.assertRaises(NotBranchError,
63
161
                              rp, '../foo')
64
162
 
65
163
        finally: