From c621f29eefcdd72e018133549eb8751c640e6a21 Mon Sep 17 00:00:00 2001 From: Andrea Panattoni Date: Mon, 9 Dec 2024 14:45:19 +0100 Subject: [PATCH 1/2] e2e: Don't allocate TTY when executing commands Executing commands on pods allocating TTY may produce additional, unwanted characters like: ``` \x1b[1;31m2024-12-06T20:33:56.630784Z: ``` We saw this in some CI run like https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/periodic-ci-openshift-release-master-nightly-4.18-e2e-telco5g-sno-cnftests/1865094117650862080/artifacts/e2e-telco5g-sno-cnftests/telco5g-cnf-tests/artifacts/test_results.html Avoid allocating TTY in the automated test suite. Signed-off-by: Andrea Panattoni --- test/util/pod/pod.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/util/pod/pod.go b/test/util/pod/pod.go index 541eda1ad..c99ae00b2 100644 --- a/test/util/pod/pod.go +++ b/test/util/pod/pod.go @@ -117,7 +117,6 @@ func ExecCommand(cs *testclient.ClientSet, pod *corev1.Pod, command ...string) ( Command: command, Stdout: true, Stderr: true, - TTY: true, }, scheme.ParameterCodec) exec, err := remotecommand.NewSPDYExecutor(cs.Config, "POST", req.URL()) @@ -125,10 +124,9 @@ func ExecCommand(cs *testclient.ClientSet, pod *corev1.Pod, command ...string) ( return buf.String(), errbuf.String(), err } - err = exec.Stream(remotecommand.StreamOptions{ + err = exec.StreamWithContext(context.Background(), remotecommand.StreamOptions{ Stdout: &buf, Stderr: &errbuf, - Tty: true, }) if err != nil { return buf.String(), errbuf.String(), err From 7f8eff4823f5b383c43f1ea4622a969bc3750b73 Mon Sep 17 00:00:00 2001 From: Andrea Panattoni Date: Tue, 10 Dec 2024 16:54:24 +0100 Subject: [PATCH 2/2] e2e: Use `cat` instead of `more` to read files Signed-off-by: Andrea Panattoni --- test/conformance/tests/test_sriov_operator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conformance/tests/test_sriov_operator.go b/test/conformance/tests/test_sriov_operator.go index bf7a917d3..c9a60474d 100644 --- a/test/conformance/tests/test_sriov_operator.go +++ b/test/conformance/tests/test_sriov_operator.go @@ -937,7 +937,7 @@ var _ = Describe("[sriov] operator", func() { waitForNetAttachDef(sriovNetworkName, namespaces.Test) testPod := createTestPod(node, []string{sriovNetworkName}) - stdout, _, err := pod.ExecCommand(clients, testPod, "more", "/proc/sys/net/ipv4/conf/net1/accept_redirects") + stdout, _, err := pod.ExecCommand(clients, testPod, "cat", "/proc/sys/net/ipv4/conf/net1/accept_redirects") Expect(err).ToNot(HaveOccurred()) Expect(strings.TrimSpace(stdout)).To(Equal("1"))