← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_reference/test_fetch.py
17
17
 
18
18
from bzrlib import (
19
19
    branch,
20
 
    errors,
21
 
    graph,
22
 
    )
23
 
from bzrlib.smart import (
24
 
    server,
 
20
    vf_search,
25
21
    )
26
22
from bzrlib.tests.per_repository import TestCaseWithRepository
27
23
 
176
172
        self.addCleanup(target.lock_write().unlock)
177
173
        target.fetch(
178
174
            repo_missing_fallbacks,
179
 
            fetch_spec=graph.EverythingResult(repo_missing_fallbacks))
 
175
            fetch_spec=vf_search.EverythingResult(repo_missing_fallbacks))
180
176
        self.assertEqual(repo_missing_fallbacks.revisions.keys(),
181
177
            target.revisions.keys())
182
178
        self.assertEqual(repo_missing_fallbacks.inventories.keys(),