Merge lp:~jelmer/brz/drop-flapping into lp:brz

Proposed by Jelmer Vernooij on 2018-08-20
Status: Merged
Approved by: Jelmer Vernooij on 2018-09-14
Approved revision: 7095
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/drop-flapping
Merge into: lp:brz
Prerequisite: lp:~jelmer/brz/python3-y
Diff against target: 94 lines (+6/-26)
5 files modified
Makefile (+1/-2)
breezy/git/remote.py (+2/-6)
breezy/git/tests/test_fetch.py (+2/-0)
breezy/plugins/launchpad/lp_api.py (+1/-1)
python3.flapping (+0/-17)
To merge this branch: bzr merge lp:~jelmer/brz/drop-flapping
Reviewer Review Type Date Requested Status
Martin Packman 2018-08-20 Approve on 2018-09-10
Review via email: mp+353460@code.launchpad.net

This proposal supersedes a proposal from 2018-08-20.

Commit message

Drop python3.flapping.

Description of the change

Drop python3.flapping.

All flapping tests have been fixed.

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

Yeay! I'll come back and stamp this later.

Martin Packman (gz) wrote :

Thanks!

review: Approve
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/469/

The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/471/

lp:~jelmer/brz/drop-flapping updated on 2018-09-14
7095. By Jelmer Vernooij on 2018-09-14

Fix dir deletion.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2018-08-21 20:27:40 +0000
3+++ Makefile 2018-09-14 10:16:35 +0000
4@@ -74,8 +74,7 @@
5 subunit-ls --no-passthrough >> python3.passing.new
6 cp python3.passing python3.passing.old
7 grep "^#" python3.passing.old > python3.passing
8- grep -Fvxf python3.flapping python3.passing.new > python3.passing.new.solid
9- sort -u python3.passing.new.solid >> python3.passing
10+ sort -u python3.passing.new >> python3.passing
11
12 check-nodocs2: extensions
13 # Generate a stream for PQM to watch.
14
15=== modified file 'breezy/git/remote.py'
16--- breezy/git/remote.py 2018-09-13 12:30:11 +0000
17+++ breezy/git/remote.py 2018-09-14 10:16:35 +0000
18@@ -914,11 +914,8 @@
19 continue
20 peeled = refs.get_peeled(ref_name)
21 if peeled is None:
22- try:
23- peeled = refs.peel_sha(unpeeled).id
24- except KeyError:
25- # Let's just hope it's a commit
26- peeled = unpeeled
27+ # Let's just hope it's a commit
28+ peeled = unpeeled
29 if not isinstance(tag_name, text_type):
30 raise TypeError(tag_name)
31 yield (ref_name, tag_name, peeled, unpeeled)
32@@ -932,7 +929,6 @@
33 peeled[k[:-3]] = v
34 else:
35 base[k] = v
36- peeled[k] = v
37 for name, target in symrefs_dict.items():
38 base[name] = SYMREF + target
39 ret = DictRefsContainer(base)
40
41=== modified file 'breezy/git/tests/test_fetch.py'
42--- breezy/git/tests/test_fetch.py 2018-08-21 20:16:18 +0000
43+++ breezy/git/tests/test_fetch.py 2018-09-14 10:16:35 +0000
44@@ -137,6 +137,7 @@
45 bb = GitBranchBuilder()
46 bb.set_file("mylink/somefile", b"foo\nbar\n", False)
47 mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg1")
48+ bb.delete_entry("mylink/somefile")
49 bb.set_symlink("mylink", "target/")
50 mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
51 marks = bb.finish()
52@@ -162,6 +163,7 @@
53 bb = GitBranchBuilder()
54 bb.set_symlink("mylink", "target/")
55 mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg1")
56+ bb.delete_entry("mylink")
57 bb.set_file("mylink/somefile", b"foo\nbar\n", False)
58 mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
59 marks = bb.finish()
60
61=== modified file 'breezy/plugins/launchpad/lp_api.py'
62--- breezy/plugins/launchpad/lp_api.py 2017-09-26 00:55:04 +0000
63+++ breezy/plugins/launchpad/lp_api.py 2018-09-14 10:16:35 +0000
64@@ -182,7 +182,7 @@
65 return False
66 if url.startswith('lp:'):
67 return True
68- regex = re.compile('([a-z]*\+)*(bzr\+ssh|http)'
69+ regex = re.compile('([a-z]*\\+)*(bzr\\+ssh|http)'
70 '://bazaar.*.launchpad.net')
71 return bool(regex.match(url))
72
73
74=== removed file 'python3.flapping'
75--- python3.flapping 2018-08-21 00:23:35 +0000
76+++ python3.flapping 1970-01-01 00:00:00 +0000
77@@ -1,17 +0,0 @@
78-# Tests in this file are known to be flapping; i.e. they fail on some platforms or in some cases
79-# (i.e. with certain values of PYTHONHASHSEED).
80-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RemoteRepositoryFormat-default(Supported))
81-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RemoteRepositoryFormat-v2(Supported))
82-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RepositoryFormat2a)
83-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RepositoryFormat2aSubtree)
84-breezy.git.tests.test_fetch.LocalRepositoryFetchTests.test_symlink_becomes_dir
85-breezy.git.tests.test_fetch.LocalRepositoryFetchTests.test_dir_becomes_symlink
86-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_init_repo_without_username
87-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_make_repository
88-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_make_repository_quiet
89-breezy.git.tests.test_remote.FetchFromRemoteToBzrTests.test_sprout_with_annotated_tag
90-breezy.git.tests.test_remote.FetchFromRemoteToGitTests.test_sprout_with_annotated_tag
91-breezy.git.tests.test_remote.RemoteControlDirTests.test_annotated_tag
92-breezy.tests.test_sftp_transport.SFTPNonServerTest.test_get_paramiko_vendor
93-breezy.tests.test_sftp_transport.SSHVendorBadConnection.test_bad_connection_ssh
94-breezy.tests.test_repository.TestPacker.test_pack_optimizes_pack_order

Subscribers

People subscribed via source and target branches