|
@@ -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)
|
|
@@ -432,6 +429,11 @@ class DulwichTCPClientTest(CompatTestCase, DulwichClientTestBase):
|
|
|
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):
|
|
|
@staticmethod
|