From 1f1ec555aa57599a855e14e8400f867a006749e6 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 24 Jun 2021 11:10:00 -0700 Subject: [PATCH] fix checks for which proxy to use --- test/integration/functional_test.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index 095172a71c..dac90e6afa 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -110,7 +110,7 @@ func TestFunctional(t *testing.T) { defer func() { cleanupUnwantedImages(ctx, t, profile) - if GithubActionRunner() { + if GithubActionRunner() && runtime.GOOS == "linux" { mitm.Stop(t) } }() @@ -528,7 +528,7 @@ func validatePodmanEnv(ctx context.Context, t *testing.T, profile string) { // validateStartWithProxy either calls validateStartWithRegularProxy or validateStartWithCorpProxy depending on the test environment func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) { - if GithubActionRunner() { + if GithubActionRunner() && runtime.GOOS == "linux" { validateStartWithCorpProxy(ctx, t, profile) } else { validateStartWithRegularProxy(ctx, t, profile) @@ -1827,14 +1827,6 @@ users: // validateStartWithCorpProxy ensures that minikube can run behind a custom proxy func validateStartWithCorpProxy(ctx context.Context, t *testing.T, profile string) { - if !GithubActionRunner() { - t.Skip("Only run mitmproxy test on github actions") - } - - if runtime.GOOS != "linux" { - t.Skip("Only run mitmproxy test on linux") - } - defer PostMortemLogs(t, profile) // Download the mitmproxy bundle for mitmdump