/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
1
# Copyright (C) 2006, 2007, 2009, 2011, 2012, 2016 Canonical Ltd
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
16
17
"""Test the executable bit under various working tree formats."""
18
19
import os
20
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
21
from breezy import (
2911.5.4 by John Arbash Meinel
Switch around to properly look up the executable bit in the basis.
22
    osutils,
23
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
24
from breezy.transform import TreeTransform
25
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
26
27
28
class TestExecutable(TestCaseWithWorkingTree):
29
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
30
    def setUp(self):
31
        super(TestExecutable, self).setUp()
6963.2.4 by Jelmer Vernooij
Add bees.
32
        self.a_id = b"a-20051208024829-849e76f7968d7a86"
33
        self.b_id = b"b-20051208024829-849e76f7968d7a86"
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
34
        wt = self.make_branch_and_tree('b1')
35
        b = wt.branch
36
        tt = TreeTransform(wt)
6973.9.1 by Jelmer Vernooij
More test fixes.
37
        tt.new_file('a', tt.root, [b'a test\n'], self.a_id, True)
38
        tt.new_file('b', tt.root, [b'b test\n'], self.b_id, False)
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
39
        tt.apply()
40
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
41
        self.wt = wt
42
43
    def check_exist(self, tree):
44
        """Just check that both files have the right executable bits set"""
2255.2.35 by Robert Collins
Remove inappropriate use of inventory in tree executability tests. The inventory is not the authoritative source of executability.
45
        tree.lock_read()
6963.2.4 by Jelmer Vernooij
Add bees.
46
        self.assertTrue(tree.is_executable('a'), "'a' lost the execute bit")
47
        self.assertFalse(tree.is_executable('b'), "'b' gained an execute bit")
2255.2.35 by Robert Collins
Remove inappropriate use of inventory in tree executability tests. The inventory is not the authoritative source of executability.
48
        tree.unlock()
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
49
50
    def check_empty(self, tree, ignore_inv=False):
51
        """Check that the files are truly missing
52
        :param ignore_inv: If you just delete files from a working tree
53
                the inventory still shows them, so don't assert that
54
                the inventory is empty, just that the tree doesn't have them
55
        """
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
56
        tree.lock_read()
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
57
        if not ignore_inv and getattr(tree, 'root_inventory', None):
1852.6.6 by Robert Collins
Finish updating iter_entries change to make all tests pass.
58
            self.assertEqual(
6405.2.10 by Jelmer Vernooij
Fix more tests.
59
                [('', tree.root_inventory.root)],
60
                list(tree.root_inventory.iter_entries()))
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
61
        self.assertFalse(tree.has_id(self.a_id))
62
        self.assertFalse(tree.has_filename('a'))
63
        self.assertFalse(tree.has_id(self.b_id))
64
        self.assertFalse(tree.has_filename('b'))
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
65
        tree.unlock()
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
66
67
    def commit_and_branch(self):
68
        """Commit the current tree, and create a second tree"""
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
69
        r1 = self.wt.commit('adding a,b')
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
70
        # Now make sure that 'bzr branch' also preserves the
71
        # executable bit
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
72
        dir2 = self.wt.branch.controldir.sprout('b2', revision_id=r1)
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
73
        wt2 = dir2.open_workingtree()
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
74
        self.assertEqual([r1], wt2.get_parent_ids())
75
        self.assertEqual(r1, wt2.branch.last_revision())
6876.5.3 by Jelmer Vernooij
Fix test_executable test.
76
        return wt2, r1
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
77
78
    def test_01_is_executable(self):
79
        """Make sure that the tree was created and has the executable bit set"""
80
        self.check_exist(self.wt)
81
82
    def test_02_stays_executable(self):
83
        """reopen the tree and ensure it stuck."""
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
84
        self.wt = self.wt.controldir.open_workingtree()
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
85
        self.check_exist(self.wt)
86
87
    def test_03_after_commit(self):
88
        """Commit the change, and check the history"""
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
89
        r1 = self.wt.commit('adding a,b')
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
90
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
91
        rev_tree = self.wt.branch.repository.revision_tree(r1)
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
92
        self.check_exist(rev_tree)
93
94
    def test_04_after_removed(self):
95
        """Make sure reverting removed files brings them back correctly"""
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
96
        r1 = self.wt.commit('adding a,b')
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
97
98
        # Make sure the entries are gone
99
        os.remove('b1/a')
100
        os.remove('b1/b')
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
101
        self.check_empty(self.wt, ignore_inv=True)
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
102
103
        # Make sure that revert is able to bring them back,
104
        # and sets 'a' back to being executable
105
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
106
        rev_tree = self.wt.branch.repository.revision_tree(r1)
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
107
108
        self.wt.revert(['a', 'b'], rev_tree, backups=False)
109
        self.check_exist(self.wt)
110
111
    def test_05_removed_and_committed(self):
112
        """Check that reverting to an earlier commit restores them"""
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
113
        r1 = self.wt.commit('adding a,b')
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
114
115
        # Now remove them again, and make sure that after a
116
        # commit, they are still marked correctly
117
        os.remove('b1/a')
118
        os.remove('b1/b')
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
119
        r2 = self.wt.commit('removed')
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
120
121
        self.check_empty(self.wt)
122
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
123
        rev_tree = self.wt.branch.repository.revision_tree(r1)
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
124
        # Now revert back to the previous commit
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
125
        self.wt.revert(old_tree=rev_tree, backups=False)
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
126
127
        self.check_exist(self.wt)
128
129
    def test_06_branch(self):
130
        """branch b1=>b2 should preserve the executable bits"""
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
131
        # TODO: Maybe this should be a blackbox test
6876.5.3 by Jelmer Vernooij
Fix test_executable test.
132
        wt2, r1 = self.commit_and_branch()
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
133
134
        self.check_exist(wt2)
135
136
    def test_07_pull(self):
137
        """Test that pull will handle bits correctly"""
6876.5.3 by Jelmer Vernooij
Fix test_executable test.
138
        wt2, r1 = self.commit_and_branch()
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
139
140
        os.remove('b1/a')
141
        os.remove('b1/b')
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
142
        r2 = self.wt.commit('removed')
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
143
144
        # now wt2 can pull and the files should be removed
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
145
146
        # Make sure pull will delete the files
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
147
        wt2.pull(self.wt.branch)
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
148
        self.assertEqual([r2], wt2.get_parent_ids())
149
        self.assertEqual(r2, wt2.branch.last_revision())
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
150
        self.check_empty(wt2)
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
151
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
152
        # Now restore the files on the first branch and commit
1711.4.30 by John Arbash Meinel
Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
153
        # so that the second branch can pull the changes
154
        # and make sure that the executable bit has been copied
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
155
        rev_tree = self.wt.branch.repository.revision_tree(r1)
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
156
        self.wt.revert(old_tree=rev_tree, backups=False)
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
157
        r3 = self.wt.commit('resurrected')
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
158
159
        self.check_exist(self.wt)
160
161
        wt2.pull(self.wt.branch)
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
162
        self.assertEqual([r3], wt2.get_parent_ids())
163
        self.assertEqual(r3, wt2.branch.last_revision())
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
164
        self.check_exist(wt2)
165
166
    def test_08_no_op_revert(self):
167
        """Just do a simple revert without anything changed
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
168
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
169
        The bits shouldn't swap.
170
        """
6876.5.1 by Jelmer Vernooij
Avoid passing in revision ids if possible.
171
        r1 = self.wt.commit('adding a,b')
172
        rev_tree = self.wt.branch.repository.revision_tree(r1)
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
173
        self.wt.revert(old_tree=rev_tree, backups=False)
1711.4.33 by John Arbash Meinel
By Martin's suggestion, break the long test into lots of small ones.
174
        self.check_exist(self.wt)
175
2911.5.4 by John Arbash Meinel
Switch around to properly look up the executable bit in the basis.
176
    def test_commit_with_exec_from_basis(self):
177
        self.wt._is_executable_from_path_and_stat = \
178
            self.wt._is_executable_from_path_and_stat_from_basis
179
        rev_id1 = self.wt.commit('one')
180
        rev_tree1 = self.wt.branch.repository.revision_tree(rev_id1)
6913.3.4 by Jelmer Vernooij
Avoid use of inventory and file ids.
181
        a_executable = rev_tree1.is_executable('a')
182
        b_executable = rev_tree1.is_executable('b')
2911.5.4 by John Arbash Meinel
Switch around to properly look up the executable bit in the basis.
183
        self.assertIsNot(None, a_executable)
184
        self.assertTrue(a_executable)
185
        self.assertIsNot(None, b_executable)
186
        self.assertFalse(b_executable)
187
188
    def test_use_exec_from_basis(self):
6379.7.3 by Jelmer Vernooij
Fix test_use_exec_from_basis
189
        self.wt._supports_executable = lambda: False
190
        self.addCleanup(self.wt.lock_read().unlock)
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
191
        self.assertTrue(self.wt.is_executable('a'))
192
        self.assertFalse(self.wt.is_executable('b'))