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

[Jelmer Vernooij]

Drop python3.flapping.

Drop python3.flapping.

All flapping tests have been fixed.

[Martin Packman (gz)]

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

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/land-brz/460/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/land-brz/468/

[The Breezy Bot (the-breezy-bot)]

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

[The Breezy Bot (the-breezy-bot)]

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

=== modified file 'Makefile'
--- Makefile	2018-08-21 20:27:40 +0000
+++ Makefile	2018-09-14 10:16:35 +0000
@@ -74,8 +74,7 @@
 	  subunit-ls --no-passthrough >> python3.passing.new
 	cp python3.passing python3.passing.old
 	grep "^#" python3.passing.old > python3.passing
-	grep -Fvxf python3.flapping python3.passing.new > python3.passing.new.solid
-	sort -u python3.passing.new.solid >> python3.passing
+	sort -u python3.passing.new >> python3.passing
 
 check-nodocs2: extensions
 	# Generate a stream for PQM to watch.
 
=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2018-09-13 12:30:11 +0000
+++ breezy/git/remote.py	2018-09-14 10:16:35 +0000
@@ -914,11 +914,8 @@
                 continue
             peeled = refs.get_peeled(ref_name)
             if peeled is None:
-                try:
-                    peeled = refs.peel_sha(unpeeled).id
-                except KeyError:
-                    # Let's just hope it's a commit
-                    peeled = unpeeled
+                # Let's just hope it's a commit
+                peeled = unpeeled
             if not isinstance(tag_name, text_type):
                 raise TypeError(tag_name)
             yield (ref_name, tag_name, peeled, unpeeled)
@@ -932,7 +929,6 @@
             peeled[k[:-3]] = v
         else:
             base[k] = v
-            peeled[k] = v
     for name, target in symrefs_dict.items():
         base[name] = SYMREF + target
     ret = DictRefsContainer(base)
 
=== modified file 'breezy/git/tests/test_fetch.py'
--- breezy/git/tests/test_fetch.py	2018-08-21 20:16:18 +0000
+++ breezy/git/tests/test_fetch.py	2018-09-14 10:16:35 +0000
@@ -137,6 +137,7 @@
         bb = GitBranchBuilder()
         bb.set_file("mylink/somefile", b"foo\nbar\n", False)
         mark1 = bb.commit(b"Somebody <[e-mail]>", b"mymsg1")
+        bb.delete_entry("mylink/somefile")
         bb.set_symlink("mylink", "target/")
         mark2 = bb.commit(b"Somebody <[e-mail]>", b"mymsg2")
         marks = bb.finish()
@@ -162,6 +163,7 @@
         bb = GitBranchBuilder()
         bb.set_symlink("mylink", "target/")
         mark1 = bb.commit(b"Somebody <[e-mail]>", b"mymsg1")
+        bb.delete_entry("mylink")
         bb.set_file("mylink/somefile", b"foo\nbar\n", False)
         mark2 = bb.commit(b"Somebody <[e-mail]>", b"mymsg2")
         marks = bb.finish()
 
=== modified file 'breezy/plugins/launchpad/lp_api.py'
--- breezy/plugins/launchpad/lp_api.py	2017-09-26 00:55:04 +0000
+++ breezy/plugins/launchpad/lp_api.py	2018-09-14 10:16:35 +0000
@@ -182,7 +182,7 @@
             return False
         if url.startswith('lp:'):
             return True
-        regex = re.compile('([a-z]*\+)*(bzr\+ssh|http)'
+        regex = re.compile('([a-z]*\\+)*(bzr\\+ssh|http)'
                            '://bazaar.*.launchpad.net')
         return bool(regex.match(url))
 
 
=== removed file 'python3.flapping'
--- python3.flapping	2018-08-21 00:23:35 +0000
+++ python3.flapping	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# Tests in this file are known to be flapping; i.e. they fail on some platforms or in some cases
-# (i.e. with certain values of PYTHONHASHSEED).
-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RemoteRepositoryFormat-default(Supported))
-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RemoteRepositoryFormat-v2(Supported))
-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RepositoryFormat2a)
-breezy.tests.per_repository_chk.test_supported.TestCommitWriteGroupIntegrityCheck.test_missing_chk_leaf_for_inventory(RepositoryFormat2aSubtree)
-breezy.git.tests.test_fetch.LocalRepositoryFetchTests.test_symlink_becomes_dir
-breezy.git.tests.test_fetch.LocalRepositoryFetchTests.test_dir_becomes_symlink
-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_init_repo_without_username
-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_make_repository
-breezy.tests.blackbox.test_shared_repository.TestSharedRepo.test_make_repository_quiet
-breezy.git.tests.test_remote.FetchFromRemoteToBzrTests.test_sprout_with_annotated_tag
-breezy.git.tests.test_remote.FetchFromRemoteToGitTests.test_sprout_with_annotated_tag
-breezy.git.tests.test_remote.RemoteControlDirTests.test_annotated_tag
-breezy.tests.test_sftp_transport.SFTPNonServerTest.test_get_paramiko_vendor
-breezy.tests.test_sftp_transport.SSHVendorBadConnection.test_bad_connection_ssh
-breezy.tests.test_repository.TestPacker.test_pack_optimizes_pack_order