← 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: Patch Queue Manager
  • Date: 2015-10-05 13:45:00 UTC
  • mfrom: (6603.3.1 bts794146)
  • Revision ID: pqm@pqm.ubuntu.com-20151005134500-v244rho557tv0ukd
(vila) Resolve Bug #1480015: Test failure: hexify removed from paramiko
 (Andrew Starr-Bochicchio) (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_whitebox.py
 
1
# Copyright (C) 2005, 2006, 2008-2012 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
1
17
import os
2
 
import unittest
3
 
 
4
 
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
 
from bzrlib.branch import ScratchBranch, Branch
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'])
 
18
 
 
19
import bzrlib
 
20
from bzrlib import (
 
21
    errors,
 
22
    osutils,
 
23
    tests,
 
24
    )
 
25
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
 
26
 
 
27
 
 
28
class MoreTests(tests.TestCaseWithTransport):
107
29
 
108
30
    def test_relpath(self):
109
31
        """test for branch path lookups
110
 
    
 
32
 
111
33
        bzrlib.osutils._relpath do a simple but subtle
112
34
        job: given a path (either relative to cwd or absolute), work out
113
35
        if it is inside a branch and return the path relative to the base.
114
36
        """
115
 
        from bzrlib.osutils import relpath
116
 
        import tempfile, shutil
117
 
        
118
 
        savedir = os.getcwdu()
119
 
        dtmp = tempfile.mkdtemp()
 
37
        dtmp = osutils.mkdtemp()
 
38
        self.addCleanup(osutils.rmtree, dtmp)
120
39
        # On Mac OSX, /tmp actually expands to /private/tmp
121
 
        dtmp = os.path.realpath(dtmp)
 
40
        dtmp = realpath(dtmp)
122
41
 
123
42
        def rp(p):
124
43
            return relpath(dtmp, p)
125
 
        
126
 
        try:
127
 
            # check paths inside dtmp while standing outside it
128
 
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
129
 
 
130
 
            # root = nothing
131
 
            self.assertEqual(rp(dtmp), '')
132
 
 
133
 
            self.assertRaises(NotBranchError,
134
 
                              rp,
135
 
                              '/etc')
136
 
 
137
 
            # now some near-miss operations -- note that
138
 
            # os.path.commonprefix gets these wrong!
139
 
            self.assertRaises(NotBranchError,
140
 
                              rp,
141
 
                              dtmp.rstrip('\\/') + '2')
142
 
 
143
 
            self.assertRaises(NotBranchError,
144
 
                              rp,
145
 
                              dtmp.rstrip('\\/') + '2/foo')
146
 
 
147
 
            # now operations based on relpath of files in current
148
 
            # directory, or nearby
149
 
            os.chdir(dtmp)
150
 
 
151
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
152
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
153
 
 
154
 
            self.assertEqual(rp('foo'), 'foo')
155
 
 
156
 
            self.assertEqual(rp('./foo'), 'foo')
157
 
 
158
 
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
159
 
 
160
 
            self.assertRaises(NotBranchError,
161
 
                              rp, '../foo')
162
 
 
163
 
        finally:
164
 
            os.chdir(savedir)
165
 
            shutil.rmtree(dtmp)
 
44
 
 
45
        # check paths inside dtmp while standing outside it
 
46
        self.assertEqual('foo', rp(pathjoin(dtmp, 'foo')))
 
47
 
 
48
        # root = nothing
 
49
        self.assertEqual('', rp(dtmp))
 
50
        self.assertRaises(errors.PathNotChild, rp, '/etc')
 
51
 
 
52
        # now some near-miss operations -- note that
 
53
        # os.path.commonprefix gets these wrong!
 
54
        self.assertRaises(errors.PathNotChild, rp, dtmp.rstrip('\\/') + '2')
 
55
        self.assertRaises(errors.PathNotChild, rp, dtmp.rstrip('\\/') + '2/foo')
 
56
 
 
57
        # now operations based on relpath of files in current
 
58
        # directory, or nearby
 
59
 
 
60
        os.chdir(dtmp)
 
61
        self.assertEqual('foo/bar/quux', rp('foo/bar/quux'))
 
62
        self.assertEqual('foo', rp('foo'))
 
63
        self.assertEqual('foo', rp('./foo'))
 
64
        self.assertEqual('foo', rp(abspath('foo')))
 
65
        self.assertRaises(errors.PathNotChild, rp, '../foo')