← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-13 20:33:57 UTC
  • mfrom: (2283 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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
51
51
from bzrlib.trace import mutter
52
52
from bzrlib.transport import get_transport
53
53
from bzrlib.upgrade import upgrade
 
54
from bzrlib.repofmt import weaverepo
54
55
 
55
56
 
56
57
class TestCaseWithBzrDir(TestCaseWithTransport):
1106
1107
        self.assertTrue(isinstance(dir.get_repository_transport(None),
1107
1108
                                   transport.Transport))
1108
1109
        # with a given format, either the bzr dir supports identifiable
1109
 
        # repositoryes, or it supports anonymous  repository formats, but not both.
1110
 
        anonymous_format = repository.RepositoryFormat6()
1111
 
        identifiable_format = repository.RepositoryFormat7()
 
1110
        # repositories, or it supports anonymous  repository formats, but not both.
 
1111
        anonymous_format = weaverepo.RepositoryFormat6()
 
1112
        identifiable_format = weaverepo.RepositoryFormat7()
1112
1113
        try:
1113
1114
            found_transport = dir.get_repository_transport(anonymous_format)
1114
1115
            self.assertRaises(errors.IncompatibleFormat,