Bazaar

Merge lp:~lifeless/bzr/loomsupport into lp:bzr

  1. loomsupport
  2. Merge into bzr.dev
Proposed by Robert Collins
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 5335
Proposed branch: lp:~lifeless/bzr/loomsupport
Merge into: lp:bzr
Diff against target: 62 lines (+0/-53)
1 file modified
bzrlib/tests/per_branch/test_push.py (+0/-53)
To merge this branch: bzr merge lp:~lifeless/bzr/loomsupport
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
bzr-core Pending
Review via email: mp+29139@code.launchpad.net

Commit message

Remove duplicate test get_parent_map_after_insert_stream.

Description of the change

Remove duplicate test get_parent_map_after_insert_stream. Makes loom
happier and the duplication isn't useful.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Test is also in per_interbranch which should apparently cover it.

review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/per_branch/test_push.py'
2--- bzrlib/tests/per_branch/test_push.py 2010-02-23 07:43:11 +0000
3+++ bzrlib/tests/per_branch/test_push.py 2010-07-04 22:48:29 +0000
4@@ -231,59 +231,6 @@
5 trunk.push(remote_branch)
6 check.check_dwim(remote_branch.base, False, True, True)
7
8- def test_no_get_parent_map_after_insert_stream(self):
9- # Effort test for bug 331823
10- self.setup_smart_server_with_call_log()
11- # Make a local branch with four revisions. Four revisions because:
12- # one to push, one there for _walk_to_common_revisions to find, one we
13- # don't want to access, one for luck :)
14- if isinstance(self.branch_format, branch.BranchReferenceFormat):
15- # This test could in principle apply to BranchReferenceFormat, but
16- # make_branch_builder doesn't support it.
17- raise tests.TestSkipped(
18- "BranchBuilder can't make reference branches.")
19- try:
20- builder = self.make_branch_builder('local')
21- except (errors.TransportNotPossible, errors.UninitializableFormat):
22- raise tests.TestNotApplicable('format not directly constructable')
23- builder.start_series()
24- builder.build_snapshot('first', None, [
25- ('add', ('', 'root-id', 'directory', ''))])
26- builder.build_snapshot('second', ['first'], [])
27- builder.build_snapshot('third', ['second'], [])
28- builder.build_snapshot('fourth', ['third'], [])
29- builder.finish_series()
30- local = builder.get_branch()
31- local = branch.Branch.open(self.get_vfs_only_url('local'))
32- # Initial push of three revisions
33- remote_bzrdir = local.bzrdir.sprout(
34- self.get_url('remote'), revision_id='third')
35- remote = remote_bzrdir.open_branch()
36- # Push fourth revision
37- self.reset_smart_call_log()
38- self.disableOptimisticGetParentMap()
39- self.assertFalse(local.is_locked())
40- local.push(remote)
41- hpss_call_names = [item.call.method for item in self.hpss_calls]
42- self.assertTrue('Repository.insert_stream_1.19' in hpss_call_names)
43- insert_stream_idx = hpss_call_names.index(
44- 'Repository.insert_stream_1.19')
45- calls_after_insert_stream = hpss_call_names[insert_stream_idx:]
46- # After inserting the stream the client has no reason to query the
47- # remote graph any further.
48- self.assertEqual(
49- ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
50- 'get', 'Branch.set_last_revision_info', 'Branch.unlock'],
51- calls_after_insert_stream)
52-
53- def disableOptimisticGetParentMap(self):
54- # Tweak some class variables to stop remote get_parent_map calls asking
55- # for or receiving more data than the caller asked for.
56- self.overrideAttr(repository.InterRepository,
57- '_walk_to_common_revisions_batch_size', 1)
58- self.overrideAttr(_mod_smart_repo.SmartServerRepositoryGetParentMap,
59- 'no_extra_results', True)
60-
61
62 class TestPushHook(per_branch.TestCaseWithBranch):
63