← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_join.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import bzrdir, repository, tests, workingtree
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    osutils,
 
23
    repository,
 
24
    tests,
 
25
    workingtree,
 
26
    )
21
27
 
22
28
 
23
29
class TestJoin(tests.TestCaseWithTransport):
50
56
    def test_join_error(self):
51
57
        base_tree, sub_tree = self.make_trees()
52
58
        os.mkdir('tree/subtree2')
53
 
        os.rename('tree/subtree', 'tree/subtree2/subtree')
 
59
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
54
60
        self.run_bzr_error(
55
61
            ('Cannot join .*subtree.  Parent directory is not versioned',),
56
62
             'join tree/subtree2/subtree')