Merge lp:~jelmer/brz/vfrepo-insert-stream into lp:brz

Proposed by Jelmer Vernooij on 2018-03-04
Status: Merged
Approved by: Jelmer Vernooij on 2018-03-05
Approved revision: 6877
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/vfrepo-insert-stream
Merge into: lp:brz
Diff against target: 13 lines (+3/-0)
1 file modified
breezy/tests/per_interbranch/test_push.py (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/vfrepo-insert-stream
Reviewer Review Type Date Requested Status
Martin Packman 2018-03-04 Approve on 2018-03-05
Review via email: mp+340583@code.launchpad.net

Commit message

Only check for specific behaviour over HPSS for VF repositories.

Description of the change

Only check for specific behaviour over HPSS for VF repositories.

i.e. don't expect pushes to git repositories to use the
Repository.insert_record_stream_1.19 HPSS call.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/per_interbranch/test_push.py'
2--- breezy/tests/per_interbranch/test_push.py 2018-03-02 00:38:34 +0000
3+++ breezy/tests/per_interbranch/test_push.py 2018-03-04 18:28:20 +0000
4@@ -267,6 +267,9 @@
5 remote_bzrdir = local.controldir.sprout(
6 self.get_url('remote'), revision_id=third)
7 remote = remote_bzrdir.open_branch()
8+ if not remote.repository._format.supports_full_versioned_files:
9+ raise tests.TestNotApplicable(
10+ 'remote is not a VersionedFile repository')
11 # Push fourth revision
12 self.reset_smart_call_log()
13 self.disableOptimisticGetParentMap()

Subscribers

People subscribed via source and target branches