Breezy

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

  1. drop-flapping
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Superseded
Proposed branch: lp:~jelmer/brz/drop-flapping
Merge into: lp:brz
Diff against target: 50 lines (+2/-22)
3 files modified
Makefile (+1/-2)
breezy/plugins/launchpad/lp_api.py (+1/-1)
python3.flapping (+0/-19)
To merge this branch: bzr merge lp:~jelmer/brz/drop-flapping
Reviewer Review Type Date Requested Status
Breezy developers Pending
Review via email: mp+353459@code.launchpad.net

This proposal has been superseded by 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.

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-07 00:40:18 +0000
3+++ Makefile 2018-08-20 21:42:24 +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/plugins/launchpad/lp_api.py'
16--- breezy/plugins/launchpad/lp_api.py 2017-09-26 00:55:04 +0000
17+++ breezy/plugins/launchpad/lp_api.py 2018-08-20 21:42:24 +0000
18@@ -182,7 +182,7 @@
19 return False
20 if url.startswith('lp:'):
21 return True
22- regex = re.compile('([a-z]*\+)*(bzr\+ssh|http)'
23+ regex = re.compile('([a-z]*\\+)*(bzr\\+ssh|http)'
24 '://bazaar.*.launchpad.net')
25 return bool(regex.match(url))
26
27
28=== removed file 'python3.flapping'
29--- python3.flapping 2018-08-08 02:10:06 +0000
30+++ python3.flapping 1970-01-01 00:00:00 +0000
31@@ -1,19 +0,0 @@
32-# Tests in this file are known to be flapping; i.e. they fail on some platforms or in some cases
33-# (i.e. with certain values of PYTHONHASHSEED).
34-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RemoteRepositoryFormat-default(Supported))
35-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RemoteRepositoryFormat-v2(Supported))
36-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RepositoryFormat2a)
37-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RepositoryFormat2aSubtree)
38-breezy.plugins.git.tests.test_blackbox.TestGitBlackBox.test_branch_ls
39-breezy.plugins.git.tests.test_blackbox.TestGitBlackBox.test_checkout
40-breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_symlink_becomes_dir
41-breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_dir_becomes_symlink
42-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_init_repo_without_username
43-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_make_repository
44-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_make_repository_quiet
45-breezy.plugins.git.tests.test_remote.FetchFromRemoteToBzrTests.test_sprout_with_annotated_tag
46-breezy.plugins.git.tests.test_remote.FetchFromRemoteToGitTests.test_sprout_with_annotated_tag
47-breezy.plugins.git.tests.test_remote.RemoteControlDirTests.test_annotated_tag
48-breezy.tests.test_sftp_transport.SFTPNonServerTest.test_get_paramiko_vendor
49-breezy.tests.test_sftp_transport.SSHVendorBadConnection.test_bad_connection_ssh
50-breezy.tests.test_repository.TestPacker.test_pack_optimizes_pack_order

Subscribers

People subscribed via source and target branches