From 75d92079e4d7c1d798aa480e5f377851c41a9aca Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Tue, 1 Jun 2021 14:58:32 -0500 Subject: [PATCH] Allow some flexibility in "kubectl logs --tail=10" test. We see that occasionally kubectl returns 11 lines (probably related to https://github.com/kubernetes/kubernetes/issues/72628). This test doesn't need to be so picky, so now it allows +/- one line from the expected count. Signed-off-by: Matt Moyer --- test/integration/concierge_impersonation_proxy_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/concierge_impersonation_proxy_test.go b/test/integration/concierge_impersonation_proxy_test.go index 74d0711f..50b59db6 100644 --- a/test/integration/concierge_impersonation_proxy_test.go +++ b/test/integration/concierge_impersonation_proxy_test.go @@ -980,7 +980,9 @@ func TestImpersonationProxy(t *testing.T) { //nolint:gocyclo // yeah, it's compl logLinesCount := 10 stdout, err = runKubectl(t, kubeconfigPath, envVarsWithProxy, "logs", "--namespace", env.ConciergeNamespace, conciergePod.Name, fmt.Sprintf("--tail=%d", logLinesCount)) require.NoError(t, err, `"kubectl logs" failed`) - require.Equalf(t, logLinesCount, strings.Count(stdout, "\n"), "wanted %d newlines in kubectl logs output:\n%s", logLinesCount, stdout) + // Expect _approximately_ logLinesCount lines in the output + // (we can't match 100% exactly due to https://github.com/kubernetes/kubernetes/issues/72628). + require.InDeltaf(t, logLinesCount, strings.Count(stdout, "\n"), 1, "wanted %d newlines in kubectl logs output:\n%s", logLinesCount, stdout) // run the kubectl attach command namespaceName := createTestNamespace(t, adminClient)