From 3d71018c82ad907d047f4e8c5ef5d0d21d62b310 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 25 Aug 2023 12:11:33 +0200 Subject: [PATCH 1/2] test: microshift: Don't force network-mode to 'user' We want our testing to be as close as possible to what end-users will experience. Changing `network-mode` is a significant difference from the default. With https://github.com/crc-org/snc/pull/797 fixed, we no longer need to force it to `user`. --- test/e2e/features/story_microshift.feature | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/features/story_microshift.feature b/test/e2e/features/story_microshift.feature index 1270706122..35b511f046 100644 --- a/test/e2e/features/story_microshift.feature +++ b/test/e2e/features/story_microshift.feature @@ -3,7 +3,6 @@ Feature: Microshift test stories Background: Given setting config property "preset" to value "microshift" succeeds - And setting config property "network-mode" to value "user" succeeds And executing single crc setup command succeeds And starting CRC with default bundle succeeds And ensuring oc command is available @@ -34,4 +33,4 @@ Feature: Microshift test stories And with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps.crc.testing" has status code "200" Then executing "curl -s http://httpd-example-testproj.apps.crc.testing" succeeds And stdout should contain "Hello CRC!" - Then with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps.crc.testing" has status code "200" \ No newline at end of file + Then with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps.crc.testing" has status code "200" From 9bae8e56d6576d46a679c379ce30ac27a90874d7 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 25 Aug 2023 12:16:36 +0200 Subject: [PATCH 2/2] Revert "e2e test: Ignore network-mode config property for non linux platform" This reverts commit 557ec94acb65317acda3d89a4d07ef1248c33581. We no longer set network-mode as part of the tests, so this code is not needed. --- test/e2e/testsuite/testsuite.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/e2e/testsuite/testsuite.go b/test/e2e/testsuite/testsuite.go index b7dbe40c02..9cd314c454 100644 --- a/test/e2e/testsuite/testsuite.go +++ b/test/e2e/testsuite/testsuite.go @@ -865,10 +865,6 @@ func setOcEnv() error { } func SetConfigPropertyToValueSucceedsOrFails(property string, value string, expected string) error { - // Since network-mode is only supported on Linux, we skip this property test for non-linux platforms - if property == "network-mode" && runtime.GOOS != "linux" { - return nil - } if value == "current bundle" { if !userProvidedBundle { value = filepath.Join(util.CRCHome, "cache", bundleName)