kola/ torcx removal: address feedback from PR review

Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
flatcar · Oct 16, 2023 · ac393eb · ac393eb
1 parent 16b5ee1
commit ac393eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/kola/tests/sysext/disable_containerd.go b/kola/tests/sysext/disable_containerd.go
@@ -1,5 +1,7 @@
 // Copyright 2023 The Flatcar Maintainers.
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -51,7 +53,7 @@ storage:
 func containerdDisable(c cluster.TestCluster) {
 	m := c.Machines()[0]
 	output := c.MustSSH(m,
-		`test ! -f /usr/bin/containerd || echo "ERROR"`)
+		`test -f /usr/bin/containerd && echo "ERROR" || true`)
 	if string(output) == "ERROR" {
 		c.Errorf("/usr/bin/containerd exists even when sysext is disabled!")
 	}

diff --git a/kola/tests/sysext/disable_docker.go b/kola/tests/sysext/disable_docker.go
@@ -1,5 +1,7 @@
 // Copyright 2023 The Flatcar Maintainers.
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -46,7 +48,7 @@ storage:
 func dockerDisable(c cluster.TestCluster) {
 	m := c.Machines()[0]
 	output := c.MustSSH(m,
-		`test ! -f /usr/bin/docker || echo "ERROR"`)
+		`test -f /usr/bin/docker && echo "ERROR" || true`)
 	if string(output) == "ERROR" {
 		c.Errorf("/usr/bin/docker exists even when sysext is disabled!")
 	}