From 785e34a4ebacee7dea16af6d16725647b7f6fd7d Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Fri, 25 Mar 2022 17:06:26 +0100 Subject: Return error on run command --- src/server_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/server_test.go b/src/server_test.go index 3a19d4d..3492e01 100644 --- a/src/server_test.go +++ b/src/server_test.go @@ -10,27 +10,27 @@ import ( "strings" ) -func RunCommand(t *testing.T, name string, args ...string) { +func runCommand(t *testing.T, errBuffer *strings.Builder, name string, args ...string) error { cmd := exec.Command(name, args...) - var errBuffer strings.Builder - cmd.Stderr = &errBuffer + cmd.Stderr = errBuffer err := cmd.Start() if err != nil { - t.Errorf("%v", err) + return err } - err = cmd.Wait() - - if err != nil { - t.Errorf("Login OAuth with selenium script failed with error %v and stderr %s", err, errBuffer.String()) - } + return cmd.Wait() } func LoginOAuthSelenium(t* testing.T, url string) { // We could use the go selenium library // But it does not support the latest selenium v4 just yet - RunCommand(t, "python3", "../selenium_eduvpn.py", url) + var errBuffer strings.Builder + err := runCommand(t, &errBuffer, "python3", "../selenium_eduvpn.py", url) + + if err != nil { + t.Errorf("Login OAuth with selenium script failed with error %v and stderr %s", err, errBuffer.String()) + } } func StateCallback(t *testing.T, oldState string, newState string, data string) { -- cgit v1.2.3