← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_reference/__init__.py

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_reference/__init__.py
25
25
from bzrlib import (
26
26
    errors,
27
27
    remote,
28
 
    urlutils,
29
28
    )
30
29
from bzrlib.bzrdir import BzrDir
31
30
from bzrlib.tests import multiply_tests
37
36
 
38
37
class TestCaseWithExternalReferenceRepository(TestCaseWithRepository):
39
38
 
40
 
    def make_referring(self, relpath, a_repository):
 
39
    def make_referring(self, relpath, target_path):
41
40
        """Get a new repository that refers to a_repository.
42
41
 
43
42
        :param relpath: The path to create the repository at.
44
43
        :param a_repository: A repository to refer to.
45
44
        """
46
45
        repo = self.make_repository(relpath)
47
 
        repo.add_fallback_repository(self.readonly_repository(a_repository))
 
46
        repo.add_fallback_repository(self.readonly_repository(target_path))
48
47
        return repo
49
48
 
50
 
    def readonly_repository(self, repo):
51
 
        relpath = urlutils.basename(repo.bzrdir.user_url.rstrip('/'))
 
49
    def readonly_repository(self, relpath):
52
50
        return BzrDir.open_from_transport(
53
51
            self.get_readonly_transport(relpath)).open_repository()
54
52
 
60
58
        # because developers use this api to setup the tree, branch and
61
59
        # repository for their tests: having it not give the right repository
62
60
        # type would invalidate the tests.
63
 
        tree = self.make_branch_and_tree('repo')
64
 
        repo = self.make_referring('referring', tree.branch.repository)
 
61
        self.make_branch_and_tree('repo')
 
62
        repo = self.make_referring('referring', 'repo')
65
63
        self.assertIsInstance(repo._format,
66
64
            self.repository_format.__class__)
67
65