~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_whitebox.py

Bugfix the symbol_versioning deprecation decorators to update the
__module__ attribute of methods and functions. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#! /usr/bin/python
2
 
 
3
 
from bzrlib.branch import ScratchBranch
4
 
from bzrlib.errors import NotBranchError
5
 
from unittest import TestCase
6
 
import os, unittest
7
 
 
8
 
class BranchPathTestCase(TestCase):
9
 
    """test for branch path lookups
10
 
 
11
 
    Branch.relpath and bzrlib.branch._relpath do a simple but subtle
12
 
    job: given a path (either relative to cwd or absolute), work out
13
 
    if it is inside a branch and return the path relative to the base.
14
 
    """
 
1
import os
 
2
import unittest
 
3
 
 
4
from bzrlib.tests import TestCaseInTempDir, TestCase
 
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 TestBranch(TestCaseInTempDir):
 
11
 
 
12
    def test_no_changes(self):
 
13
        from bzrlib.errors import PointlessCommit
 
14
        
 
15
        b = Branch.initialize(u'.')
 
16
 
 
17
        self.build_tree(['hello.txt'])
 
18
 
 
19
        self.assertRaises(PointlessCommit,
 
20
                          b.working_tree().commit,
 
21
                          'commit without adding',
 
22
                          allow_pointless=False)
 
23
 
 
24
        b.working_tree().commit('commit pointless tree',
 
25
                 allow_pointless=True)
 
26
 
 
27
        b.working_tree().add('hello.txt')
 
28
        
 
29
        b.working_tree().commit('commit first added file',
 
30
                 allow_pointless=False)
 
31
        
 
32
        self.assertRaises(PointlessCommit,
 
33
                          b.working_tree().commit,
 
34
                          'commit after adding file',
 
35
                          allow_pointless=False)
 
36
        
 
37
        b.working_tree().commit('commit pointless revision with one file',
 
38
                 allow_pointless=True)
 
39
 
 
40
 
 
41
class MoreTests(TestCaseInTempDir):
 
42
 
 
43
    def test_rename_dirs(self):
 
44
        """Test renaming directories and the files within them."""
 
45
        b = Branch.initialize(u'.')
 
46
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
 
47
        b.working_tree().add(['dir', 'dir/sub', 'dir/sub/file'])
 
48
 
 
49
        b.working_tree().commit('create initial state')
 
50
 
 
51
        # TODO: lift out to a test helper that checks the shape of
 
52
        # an inventory
 
53
        
 
54
        revid = b.revision_history()[0]
 
55
        self.log('first revision_id is {%s}' % revid)
 
56
        
 
57
        inv = b.get_revision_inventory(revid)
 
58
        self.log('contents of inventory: %r' % inv.entries())
 
59
 
 
60
        self.check_inventory_shape(inv,
 
61
                                   ['dir', 'dir/sub', 'dir/sub/file'])
 
62
 
 
63
        b.working_tree().rename_one('dir', 'newdir')
 
64
 
 
65
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
 
66
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
 
67
 
 
68
        b.working_tree().rename_one('newdir/sub', 'newdir/newsub')
 
69
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
 
70
                                   ['newdir', 'newdir/newsub',
 
71
                                    'newdir/newsub/file'])
 
72
 
 
73
    def test_relpath(self):
 
74
        """test for branch path lookups
15
75
    
16
 
    def runTest(self):
17
 
        from bzrlib.branch import _relpath
 
76
        bzrlib.osutils._relpath do a simple but subtle
 
77
        job: given a path (either relative to cwd or absolute), work out
 
78
        if it is inside a branch and return the path relative to the base.
 
79
        """
18
80
        import tempfile, shutil
19
81
        
20
82
        savedir = os.getcwdu()
21
83
        dtmp = tempfile.mkdtemp()
 
84
        # On Mac OSX, /tmp actually expands to /private/tmp
 
85
        dtmp = realpath(dtmp)
22
86
 
23
87
        def rp(p):
24
 
            return _relpath(dtmp, p)
 
88
            return relpath(dtmp, p)
25
89
        
26
90
        try:
27
91
            # check paths inside dtmp while standing outside it
28
 
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
 
92
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
29
93
 
30
94
            # root = nothing
31
95
            self.assertEqual(rp(dtmp), '')
32
96
 
33
 
            self.assertRaises(NotBranchError,
 
97
            self.assertRaises(PathNotChild,
34
98
                              rp,
35
99
                              '/etc')
36
100
 
37
101
            # now some near-miss operations -- note that
38
102
            # os.path.commonprefix gets these wrong!
39
 
            self.assertRaises(NotBranchError,
 
103
            self.assertRaises(PathNotChild,
40
104
                              rp,
41
105
                              dtmp.rstrip('\\/') + '2')
42
106
 
43
 
            self.assertRaises(NotBranchError,
 
107
            self.assertRaises(PathNotChild,
44
108
                              rp,
45
109
                              dtmp.rstrip('\\/') + '2/foo')
46
110
 
54
118
 
55
119
            self.assertEqual(rp('./foo'), 'foo')
56
120
 
57
 
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
 
121
            self.assertEqual(rp(abspath('foo')), 'foo')
58
122
 
59
 
            self.assertRaises(NotBranchError,
 
123
            self.assertRaises(PathNotChild,
60
124
                              rp, '../foo')
61
125
 
62
126
        finally:
63
127
            os.chdir(savedir)
64
128
            shutil.rmtree(dtmp)
65
 
 
66
 
                              
67
 
if __name__ == '__main__':
68
 
    unittest.main()
69