/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

  • Committer: Martin Pool
  • Date: 2007-10-03 08:06:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071003080644-oivy0gkg98sex0ed
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).

Add new LockFailed, which doesn't imply that we failed to get it because of
contention.  Raise this if we fail to create the pending or lock directories
because of Transport errors.

UnlockableTransport is not an internal error.

ReadOnlyLockError has a message which didn't match its name or usage; it's now
deprecated and callers are updated to use LockFailed which is more appropriate.

Add zero_ninetytwo deprecation symbol.

Unify assertMatchesRe with TestCase.assertContainsRe.

When the constructor is deprecated, just say that the class is deprecated, not
the __init__ method - this works better with applyDeprecated in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
from bzrlib import bzrdir, errors, tests
 
20
import bzrlib
 
21
import bzrlib.errors as errors
21
22
from bzrlib.reconcile import reconcile, Reconciler
22
23
from bzrlib.revision import Revision
23
 
from bzrlib.tests.per_repository import TestCaseWithRepository
 
24
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
24
25
from bzrlib.transport import get_transport
25
26
from bzrlib.workingtree import WorkingTree
26
27
 
29
30
 
30
31
    def test_reweave_empty(self):
31
32
        # we want a repo capable format
32
 
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
 
33
        parent = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('.')
33
34
        parent.create_repository(shared=True)
34
35
        parent.root_transport.mkdir('child')
35
 
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
 
36
        child = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('child')
36
37
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
37
38
        reconciler = Reconciler(child)
38
39
        reconciler.reconcile()
43
44
        self.assertEqual(0, reconciler.inconsistent_parents)
44
45
        # and no garbage inventories
45
46
        self.assertEqual(0, reconciler.garbage_inventories)
46
 
 
47
 
 
48
 
class TestReconciler(tests.TestCaseWithTransport):
49
 
 
50
 
    def test_reconciler_with_no_branch(self):
51
 
        repo = self.make_repository('repo')
52
 
        reconciler = Reconciler(repo.bzrdir)
53
 
        reconciler.reconcile()
54
 
        # no inconsistent parents should have been found
55
 
        # but the values should have been set.
56
 
        self.assertEqual(0, reconciler.inconsistent_parents)
57
 
        # and no garbage inventories
58
 
        self.assertEqual(0, reconciler.garbage_inventories)
59
 
        self.assertIs(None, reconciler.fixed_branch_history)
60
 
 
61
 
    def test_reconciler_finds_branch(self):
62
 
        a_branch = self.make_branch('a_branch')
63
 
        reconciler = Reconciler(a_branch.bzrdir)
64
 
        reconciler.reconcile()
65
 
 
66
 
        # It should have checked the repository, and the branch
67
 
        self.assertEqual(0, reconciler.inconsistent_parents)
68
 
        self.assertEqual(0, reconciler.garbage_inventories)
69
 
        self.assertIs(False, reconciler.fixed_branch_history)