← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev 4157, this breaks a couple per-repository tests.

Looks like removing some of the InterRepo optimizers is revealing places
that we haven't fully finished the RemoteRepo api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_fetch.py
44
44
            raise TestSkipped('Cannot fetch from model2 to model1')
45
45
        repo.fetch(tree_a.branch.repository,
46
46
                   revision_id=None)
47
 
                   ## pb=bzrlib.progress.DummyProgress())
 
47
 
 
48
    def test_fetch_fails_in_write_group(self):
 
49
        # fetch() manages a write group itself, fetching within one isn't safe.
 
50
        repo = self.make_repository('a')
 
51
        repo.lock_write()
 
52
        self.addCleanup(repo.unlock)
 
53
        repo.start_write_group()
 
54
        self.addCleanup(repo.abort_write_group)
 
55
        # Don't need a specific class - not expecting flow control based on
 
56
        # this.
 
57
        self.assertRaises(errors.BzrError, repo.fetch, repo)
48
58
 
49
59
    def test_fetch_to_knit3(self):
50
60
        # create a repository of the sort we are testing.