← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2008-08-26 08:25:27 UTC
  • mto: (3668.1.1 trunk) (3703.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3669.
  • Revision ID: v.ladeuil+lp@free.fr-20080826082527-109yyxzc0u24oeel
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.

* bzrlib/transform.py:
(TransformPreview.__init__): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/test_whitebox.py:
(MoreTests.test_relpath): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/test_setup.py:
(TestSetup.test_build_and_install): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/test_bundle.py:
(BundleTester.get_checkout): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/tests/blackbox/test_outside_wt.py:
(TestOutsideWT.test_cwd_log,
TestOutsideWT.test_diff_outside_tree): Use osutils.mkdtemp instead
of tempfile.mkdtemp.

* bzrlib/smart/repository.py:
(SmartServerRepositoryTarball._copy_to_tempdir): Use
osutils.mkdtemp instead of tempfile.mkdtemp.
(SmartServerRepositoryTarball._tarfile_response): Line too long.

* bzrlib/remote.py:
(RemoteRepository._copy_repository_tarball): Use osutils.mkdtemp
instead of tempfile.mkdtemp.

* bzrlib/osutils.py:
(_mac_mkdtemp): Add docstring.

* bzrlib/mail_client.py:
(ExternalMailClient.compose): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

* bzrlib/diff.py:
(DiffFromTool.__init__): Use osutils.mkdtemp instead of
tempfile.mkdtemp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
18
18
from cStringIO import StringIO
19
19
import os
20
20
 
21
 
import bzrlib
 
21
from bzrlib import (
 
22
    bzrdir,
 
23
    conflicts,
 
24
    errors,
 
25
    workingtree,
 
26
    )
22
27
from bzrlib.branch import Branch
23
 
from bzrlib import bzrdir, conflicts, errors, workingtree
24
28
from bzrlib.bzrdir import BzrDir
25
 
from bzrlib.errors import NotBranchError, NotVersionedError
26
29
from bzrlib.lockdir import LockDir
27
 
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
28
 
from bzrlib.tests import TestCaseWithTransport, TestSkipped
29
 
from bzrlib.trace import mutter
 
30
from bzrlib.mutabletree import needs_tree_write_lock
 
31
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
30
32
from bzrlib.transport import get_transport
31
 
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
32
 
                                WorkingTree)
 
33
from bzrlib.workingtree import (
 
34
    TreeEntry,
 
35
    TreeDirectory,
 
36
    TreeFile,
 
37
    TreeLink,
 
38
    )
 
39
 
33
40
 
34
41
class TestTreeDirectory(TestCaseWithTransport):
35
42
 
86
93
        """See WorkingTreeFormat.get_format_string()."""
87
94
        return "Sample tree format."
88
95
 
89
 
    def initialize(self, a_bzrdir, revision_id=None):
 
96
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
97
                   accelerator_tree=None, hardlink=False):
90
98
        """Sample branches cannot be created."""
91
99
        t = a_bzrdir.get_workingtree_transport(self)
92
 
        t.put('format', StringIO(self.get_format_string()))
 
100
        t.put_bytes('format', self.get_format_string())
93
101
        return 'A tree'
94
102
 
95
103
    def is_supported(self):
166
174
        t = control.get_workingtree_transport(None)
167
175
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
168
176
                             t.get('format').read())
169
 
        self.assertEqualDiff('<inventory format="5">\n'
170
 
                             '</inventory>\n',
171
 
                             t.get('inventory').read())
 
177
        self.assertEqualDiff(t.get('inventory').read(), 
 
178
                              '<inventory format="5">\n'
 
179
                              '</inventory>\n',
 
180
                             )
172
181
        self.assertEqualDiff('### bzr hashcache v5\n',
173
182
                             t.get('stat-cache').read())
174
183
        self.assertFalse(t.has('inventory.basis'))
207
216
        control.create_repository()
208
217
        control.create_branch()
209
218
        tree = workingtree.WorkingTreeFormat3().initialize(control)
210
 
        tree._control_files._transport.delete("pending-merges")
211
 
        self.assertEqual([], tree.pending_merges())
 
219
        tree._transport.delete("pending-merges")
 
220
        self.assertEqual([], tree.get_parent_ids())
212
221
 
213
222
 
214
223
class TestFormat2WorkingTree(TestCaseWithTransport):
216
225
 
217
226
    def create_format2_tree(self, url):
218
227
        return self.make_branch_and_tree(
219
 
            url, format=bzrlib.bzrdir.BzrDirFormat6())
 
228
            url, format=bzrdir.BzrDirFormat6())
220
229
 
221
230
    def test_conflicts(self):
222
231
        # test backwards compatability
241
250
        self.assertEqual(list(tree.conflicts()), [expected])
242
251
 
243
252
 
244
 
class TestNonFormatSpecificCode(TestCaseWithTransport):
245
 
    """This class contains tests of workingtree that are not format specific."""
246
 
 
247
 
    
248
 
    def test_gen_file_id(self):
249
 
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('bar'), 'bar-')
250
 
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('Mwoo oof\t m'), 'Mwoooofm-')
251
 
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('..gam.py'), 'gam.py-')
252
 
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('..Mwoo oof\t m'), 'Mwoooofm-')
253
 
 
254
 
    def test_next_id_suffix(self):
255
 
        bzrlib.workingtree._gen_id_suffix = None
256
 
        bzrlib.workingtree._next_id_suffix()
257
 
        self.assertNotEqual(None, bzrlib.workingtree._gen_id_suffix)
258
 
        bzrlib.workingtree._gen_id_suffix = "foo-"
259
 
        bzrlib.workingtree._gen_id_serial = 1
260
 
        self.assertEqual("foo-2", bzrlib.workingtree._next_id_suffix())
261
 
        self.assertEqual("foo-3", bzrlib.workingtree._next_id_suffix())
262
 
        self.assertEqual("foo-4", bzrlib.workingtree._next_id_suffix())
263
 
        self.assertEqual("foo-5", bzrlib.workingtree._next_id_suffix())
264
 
        self.assertEqual("foo-6", bzrlib.workingtree._next_id_suffix())
265
 
        self.assertEqual("foo-7", bzrlib.workingtree._next_id_suffix())
266
 
        self.assertEqual("foo-8", bzrlib.workingtree._next_id_suffix())
267
 
        self.assertEqual("foo-9", bzrlib.workingtree._next_id_suffix())
268
 
        self.assertEqual("foo-10", bzrlib.workingtree._next_id_suffix())
269
 
 
270
 
    def test__translate_ignore_rule(self):
271
 
        tree = self.make_branch_and_tree('.')
272
 
        # translation should return the regex, the number of groups in it,
273
 
        # and the original rule in a tuple.
274
 
        # there are three sorts of ignore rules:
275
 
        # root only - regex is the rule itself without the leading ./
276
 
        self.assertEqual(
277
 
            "(rootdirrule$)", 
278
 
            tree._translate_ignore_rule("./rootdirrule"))
279
 
        # full path - regex is the rule itself
280
 
        self.assertEqual(
281
 
            "(path\\/to\\/file$)",
282
 
            tree._translate_ignore_rule("path/to/file"))
283
 
        # basename only rule - regex is a rule that ignores everything up
284
 
        # to the last / in the filename
285
 
        self.assertEqual(
286
 
            "((?:.*/)?(?!.*/)basenamerule$)",
287
 
            tree._translate_ignore_rule("basenamerule"))
288
 
 
289
 
    def test__combine_ignore_rules(self):
290
 
        tree = self.make_branch_and_tree('.')
291
 
        # the combined ignore regexs need the outer group indices
292
 
        # placed in a dictionary with the rules that were combined.
293
 
        # an empty set of rules
294
 
        # this is returned as a list of combined regex,rule sets, because
295
 
        # python has a limit of 100 combined regexes.
296
 
        compiled_rules = tree._combine_ignore_rules([])
297
 
        self.assertEqual([], compiled_rules)
298
 
        # one of each type of rule.
299
 
        compiled_rules = tree._combine_ignore_rules(
300
 
            ["rule1", "rule/two", "./three"])[0]
301
 
        # what type *is* the compiled regex to do an isinstance of ?
302
 
        self.assertEqual(3, compiled_rules[0].groups)
303
 
        self.assertEqual(
304
 
            {0:"rule1",1:"rule/two",2:"./three"},
305
 
            compiled_rules[1])
306
 
 
307
 
    def test__combine_ignore_rules_grouping(self):
308
 
        tree = self.make_branch_and_tree('.')
309
 
        # when there are too many rules, the output is split into groups of 100
310
 
        rules = []
311
 
        for index in range(198):
312
 
            rules.append('foo')
313
 
        self.assertEqual(2, len(tree._combine_ignore_rules(rules)))
314
 
 
315
 
    def test__get_ignore_rules_as_regex(self):
316
 
        tree = self.make_branch_and_tree('.')
317
 
        self.build_tree_contents([('.bzrignore', 'CVS\n.hg\n')])
318
 
        reference_output = tree._combine_ignore_rules(['CVS', '.hg'])[0]
319
 
        regex_rules = tree._get_ignore_rules_as_regex()[0]
320
 
        self.assertEqual(len(reference_output[1]), regex_rules[0].groups)
321
 
        self.assertEqual(reference_output[1], regex_rules[1])
 
253
class InstrumentedTree(object):
 
254
    """A instrumented tree to check the needs_tree_write_lock decorator."""
 
255
 
 
256
    def __init__(self):
 
257
        self._locks = []
 
258
 
 
259
    def lock_tree_write(self):
 
260
        self._locks.append('t')
 
261
 
 
262
    @needs_tree_write_lock
 
263
    def method_with_tree_write_lock(self, *args, **kwargs):
 
264
        """A lock_tree_write decorated method that returns its arguments."""
 
265
        return args, kwargs
 
266
 
 
267
    @needs_tree_write_lock
 
268
    def method_that_raises(self):
 
269
        """This method causes an exception when called with parameters.
 
270
        
 
271
        This allows the decorator code to be checked - it should still call
 
272
        unlock.
 
273
        """
 
274
 
 
275
    def unlock(self):
 
276
        self._locks.append('u')
 
277
 
 
278
 
 
279
class TestInstrumentedTree(TestCase):
 
280
 
 
281
    def test_needs_tree_write_lock(self):
 
282
        """@needs_tree_write_lock should be semantically transparent."""
 
283
        tree = InstrumentedTree()
 
284
        self.assertEqual(
 
285
            'method_with_tree_write_lock',
 
286
            tree.method_with_tree_write_lock.__name__)
 
287
        self.assertEqual(
 
288
            "A lock_tree_write decorated method that returns its arguments.",
 
289
            tree.method_with_tree_write_lock.__doc__)
 
290
        args = (1, 2, 3)
 
291
        kwargs = {'a':'b'}
 
292
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
 
293
        self.assertEqual((args, kwargs), result)
 
294
        self.assertEqual(['t', 'u'], tree._locks)
 
295
        self.assertRaises(TypeError, tree.method_that_raises, 'foo')
 
296
        self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
 
297
 
 
298
 
 
299
class TestRevert(TestCaseWithTransport):
 
300
 
 
301
    def test_revert_conflicts_recursive(self):
 
302
        this_tree = self.make_branch_and_tree('this-tree')
 
303
        self.build_tree_contents([('this-tree/foo/',),
 
304
                                  ('this-tree/foo/bar', 'bar')])
 
305
        this_tree.add(['foo', 'foo/bar'])
 
306
        this_tree.commit('created foo/bar')
 
307
        other_tree = this_tree.bzrdir.sprout('other-tree').open_workingtree()
 
308
        self.build_tree_contents([('other-tree/foo/bar', 'baz')])
 
309
        other_tree.commit('changed bar')
 
310
        self.build_tree_contents([('this-tree/foo/bar', 'qux')])
 
311
        this_tree.commit('changed qux')
 
312
        this_tree.merge_from_branch(other_tree.branch)
 
313
        self.assertEqual(1, len(this_tree.conflicts()))
 
314
        this_tree.revert(['foo'])
 
315
        self.assertEqual(0, len(this_tree.conflicts()))
 
316
 
 
317
 
 
318
class TestAutoResolve(TestCaseWithTransport):
 
319
 
 
320
    def test_auto_resolve(self):
 
321
        base = self.make_branch_and_tree('base')
 
322
        self.build_tree_contents([('base/hello', 'Hello')])
 
323
        base.add('hello', 'hello_id')
 
324
        base.commit('Hello')
 
325
        other = base.bzrdir.sprout('other').open_workingtree()
 
326
        self.build_tree_contents([('other/hello', 'hELLO')])
 
327
        other.commit('Case switch')
 
328
        this = base.bzrdir.sprout('this').open_workingtree()
 
329
        self.failUnlessExists('this/hello')
 
330
        self.build_tree_contents([('this/hello', 'Hello World')])
 
331
        this.commit('Add World')
 
332
        this.merge_from_branch(other.branch)
 
333
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
334
                         this.conflicts())
 
335
        this.auto_resolve()
 
336
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
337
                         this.conflicts())
 
338
        self.build_tree_contents([('this/hello', '<<<<<<<')])
 
339
        this.auto_resolve()
 
340
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
341
                         this.conflicts())
 
342
        self.build_tree_contents([('this/hello', '=======')])
 
343
        this.auto_resolve()
 
344
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
345
                         this.conflicts())
 
346
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
 
347
        remaining, resolved = this.auto_resolve()
 
348
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
349
                         this.conflicts())
 
350
        self.assertEqual([], resolved)
 
351
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
 
352
        remaining, resolved = this.auto_resolve()
 
353
        self.assertEqual([], this.conflicts())
 
354
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
355
                         resolved)
 
356
        self.failIfExists('this/hello.BASE')
 
357
 
 
358
    def test_auto_resolve_dir(self):
 
359
        tree = self.make_branch_and_tree('tree')
 
360
        self.build_tree(['tree/hello/'])
 
361
        tree.add('hello', 'hello-id')
 
362
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
 
363
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
 
364
        tree.auto_resolve()
 
365
 
 
366
 
 
367
class TestFindTrees(TestCaseWithTransport):
 
368
 
 
369
    def test_find_trees(self):
 
370
        self.make_branch_and_tree('foo')
 
371
        self.make_branch_and_tree('foo/bar')
 
372
        # Sticking a tree inside a control dir is heinous, so let's skip it
 
373
        self.make_branch_and_tree('foo/.bzr/baz')
 
374
        self.make_branch('qux')
 
375
        trees = workingtree.WorkingTree.find_trees('.')
 
376
        self.assertEqual(2, len(list(trees)))