← 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: Robert Collins
  • Date: 2006-02-15 08:11:37 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060215081137-4c27377517e96dd1
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.

Show diffs side-by-side

added added

removed removed

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