Commit d393a95c authored by Arnaud Rebillout's avatar Arnaud Rebillout

Remove patch for flaky test TestClientWithRequestTimeout

The test doesn't apply anymore.

Conversation at https://github.com/moby/moby/issues/38587 suggests that
one of the 2 failures we observed might be fixed.

As for the second one, seems like some work related to it was merged,
but not in the version 18.09.9, so I think we'll have to re-introduce
this patch.

Let's drop it for now and see what happens.
Signed-off-by: Arnaud Rebillout's avatarArnaud Rebillout <arnaud.rebillout@collabora.com>
parent 0893b408
......@@ -33,9 +33,6 @@ test--disable-containerizedengine-update-test.patch
test--fix-test-errors.patch
test--skip-TestAdapterReadLogs.patch
test--skip-TestChangesWithChangesGH13590.patch
test--skip-TestClientWithRequestTimeout.patch
test--skip-TestGetRootUIDGID.patch
test--skip-TestStateRunStop.patch
test--skip-network-tests.patch
......
From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Thu, 24 Jan 2019 15:22:58 +0700
Subject: Skip TestClientWithRequestTimeout
This test seems to be flaky. Please follow-up upstream for more details:
<https://github.com/moby/moby/issues/38587>
Origin: vendor, Debian
Forwarded: not-needed, Debian-specific
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
--- a/engine/pkg/plugins/client_test.go
+++ b/engine/pkg/plugins/client_test.go
@@ -237,6 +237,7 @@
}
func TestClientWithRequestTimeout(t *testing.T) {
+ t.Skip("DM - skipping flaky test")
timeout := 1 * time.Millisecond
testHandler := func(w http.ResponseWriter, r *http.Request) {
time.Sleep(timeout + 1*time.Millisecond)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment