commit 4c064a85f985a7ae33dc1332f569d9ca3605f560
from: Jelmer Vernooij <jelmer@jelmer.uk>
date: Tue Sep 06 14:38:23 2022 UTC

Test is flaky, so skip rather than marking as known failure.

commit - 742ab78c6d90113b7d9d499249fd711589935eae
commit + 4c064a85f985a7ae33dc1332f569d9ca3605f560
blob - 5bb513288be5751e7c7a5287fb5a6e9f97224470
blob + e9d5d2d169b195a3546aa33e229474629a402f21
--- dulwich/tests/compat/test_client.py
+++ dulwich/tests/compat/test_client.py
@@ -322,9 +322,6 @@ class DulwichClientTestBase(object):
             for r in result.refs.items():
                 dest.refs.set_if_equals(r[0], None, r[1])
 
-    # This test fails intermittently on my machine, probably due to some sort
-    # of race condition. Probably also related to #1015
-    @expectedFailure
     def test_send_remove_branch(self):
         with repo.Repo(os.path.join(self.gitroot, "dest")) as dest:
             dummy_commit = self.make_dummy_commit(dest)
@@ -431,6 +428,11 @@ class DulwichTCPClientTest(CompatTestCase, DulwichClie
         @expectedFailure
         def test_fetch_pack_no_side_band_64k(self):
             DulwichClientTestBase.test_fetch_pack_no_side_band_64k(self)
+
+    def test_send_remove_branch(self):
+        # This test fails intermittently on my machine, probably due to some sort
+        # of race condition. Probably also related to #1015
+        self.skipTest('skip flaky test; see #1015')
 
 
 class TestSSHVendor(object):