From 9335b4405d3896edc303e470836fbbe066c995bd Mon Sep 17 00:00:00 2001 From: Ayush Rangwala Date: Fri, 15 Dec 2023 00:25:30 +1100 Subject: [PATCH] t.error to t.fatal Signed-off-by: Ayush Rangwala --- test/e2e/capacitytest/capacity_test.go | 63 +++++++++++------ .../device_create_flags_test.go | 38 ++++------ .../devicecreatetest/device_create_test.go | 40 ++++------- .../devices/devicegettest/device_get_test.go | 47 +++++-------- .../device_reinstall_test.go | 38 ++++------ .../devicestarttest/device_start_test.go | 50 +++++-------- .../devicestoptest/device_stop_test.go | 32 +++------ .../deviceupdatetest/device_update_test.go | 20 +++--- .../deviceeventstest/device_event_test.go | 10 ++- .../projecteventstest/project_events_test.go | 10 ++- test/e2e/gateways/create_test.go | 13 ++-- test/e2e/gateways/delete_test.go | 10 ++- test/e2e/gateways/retrieve_test.go | 10 ++- test/e2e/ipstest/ips_get_test.go | 10 ++- test/e2e/ipstest/ips_request_test.go | 10 ++- test/e2e/metrotest/metro_test.go | 10 ++- test/e2e/ostest/os_test.go | 10 ++- test/e2e/plantest/plan_test.go | 31 +++++--- test/e2e/ports/convert_test.go | 30 +++++--- test/e2e/ports/retrieve_test.go | 10 ++- test/e2e/ports/vlans_test.go | 13 ++-- test/e2e/projecttest/project_test.go | 70 +++++++++++++------ test/e2e/sshtest/ssh_test.go | 10 ++- test/e2e/usertest/user_test.go | 10 ++- test/e2e/vlan/vlan_creat_test.go | 11 ++- test/e2e/vlan/vlan_delete_test.go | 10 ++- test/e2e/vlan/vlan_get_test.go | 10 ++- 27 files changed, 347 insertions(+), 279 deletions(-) diff --git a/test/e2e/capacitytest/capacity_test.go b/test/e2e/capacitytest/capacity_test.go index ce451bda..43123971 100644 --- a/test/e2e/capacitytest/capacity_test.go +++ b/test/e2e/capacitytest/capacity_test.go @@ -41,12 +41,16 @@ func TestCli_Capacity(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "n3.xlarge.x86") && !strings.Contains(string(out[:]), "m3.large.x86") && !strings.Contains(string(out[:]), "s3.xlarge.x86") && @@ -70,12 +74,16 @@ func TestCli_Capacity(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "c3.small.x86") && !strings.Contains(string(out[:]), "mt") && !strings.Contains(string(out[:]), "sv") && @@ -99,12 +107,16 @@ func TestCli_Capacity(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "m3.large.x86") && !strings.Contains(string(out[:]), "mt") && !strings.Contains(string(out[:]), "sv") && @@ -127,13 +139,16 @@ func TestCli_Capacity(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "c3.medium.x86") && !strings.Contains(string(out[:]), "ny") && !strings.Contains(string(out[:]), "da") { @@ -154,13 +169,16 @@ func TestCli_Capacity(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "c3.medium.x86") && !strings.Contains(string(out[:]), "m3.large.x86") && !strings.Contains(string(out[:]), "ny") && @@ -182,13 +200,16 @@ func TestCli_Capacity(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "c3.medium.x86") && !strings.Contains(string(out[:]), "m3.large.x86") && !strings.Contains(string(out[:]), "ny") && diff --git a/test/e2e/devices/devicecreateflagstest/device_create_flags_test.go b/test/e2e/devices/devicecreateflagstest/device_create_flags_test.go index 37e7c64e..4f41d1df 100644 --- a/test/e2e/devices/devicecreateflagstest/device_create_flags_test.go +++ b/test/e2e/devices/devicecreateflagstest/device_create_flags_test.go @@ -17,7 +17,6 @@ import ( func TestCli_Devices_Create_Flags(t *testing.T) { var projectId, deviceId string var err error - var resp bool subCommand := "device" consumerToken := "" apiURL := "" @@ -51,8 +50,7 @@ func TestCli_Devices_Create_Flags(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } if len(projectId) != 0 { @@ -61,19 +59,16 @@ func TestCli_Devices_Create_Flags(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout - t.Cleanup(func() { - if err := helper.CleanTestDevice(t, deviceId); err != nil && - !strings.Contains(err.Error(), "Not Found") { - t.Error(err) - } - }) if !strings.Contains(string(out[:]), "metal-cli-create-flags-dev") && !strings.Contains(string(out[:]), "Ubuntu 20.04 LTS") && @@ -89,18 +84,15 @@ func TestCli_Devices_Create_Flags(t *testing.T) { // Extract the ID from the match if len(match) > 1 { deviceId = strings.TrimSpace(match[1]) - resp, err = helper.IsDeviceStateActive(t, deviceId) - if err == nil && resp == true { - err = helper.CleanTestDevice(t, deviceId) - if err != nil { - t.Error(err) - } - err = helper.CleanTestProject(t, projectId) - if err != nil { + _, err = helper.IsDeviceStateActive(t, deviceId) + t.Cleanup(func() { + if err := helper.CleanTestDevice(t, deviceId); err != nil && + !strings.Contains(err.Error(), "Not Found") { t.Error(err) } - } else { - t.Error(err) + }) + if err != nil { + t.Fatal(err) } } } diff --git a/test/e2e/devices/devicecreatetest/device_create_test.go b/test/e2e/devices/devicecreatetest/device_create_test.go index dc3965c0..ff9ca7fb 100644 --- a/test/e2e/devices/devicecreatetest/device_create_test.go +++ b/test/e2e/devices/devicecreatetest/device_create_test.go @@ -17,7 +17,6 @@ import ( func TestCli_Devices_Create(t *testing.T) { var projectId, deviceId string var err error - var resp bool subCommand := "device" consumerToken := "" apiURL := "" @@ -51,8 +50,7 @@ func TestCli_Devices_Create(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } if len(projectId) != 0 { @@ -62,20 +60,16 @@ func TestCli_Devices_Create(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() - out, _ := io.ReadAll(r) - os.Stdout = rescueStdout - t.Cleanup(func() { - if err := helper.CleanTestDevice(t, deviceId); err != nil && - !strings.Contains(err.Error(), "Not Found") { - t.Error(err) - } - }) + out, _ := io.ReadAll(r) if !strings.Contains(string(out[:]), deviceName) && !strings.Contains(string(out[:]), "Ubuntu 20.04 LTS") && @@ -91,19 +85,15 @@ func TestCli_Devices_Create(t *testing.T) { // Extract the ID from the match if len(match) > 1 { deviceId = strings.TrimSpace(match[1]) - resp, err = helper.IsDeviceStateActive(t, deviceId) - if err != nil || resp { - if !resp { - resp, err = helper.IsDeviceStateActive(t, deviceId) - } - err = helper.CleanTestDevice(t, deviceId) - if err != nil { - t.Error(err) - } - err = helper.CleanTestProject(t, projectId) - if err != nil { + _, err = helper.IsDeviceStateActive(t, deviceId) + t.Cleanup(func() { + if err := helper.CleanTestDevice(t, deviceId); err != nil && + !strings.Contains(err.Error(), "Not Found") { t.Error(err) } + }) + if err != nil { + t.Fatal(err) } } } diff --git a/test/e2e/devices/devicegettest/device_get_test.go b/test/e2e/devices/devicegettest/device_get_test.go index 3d503d93..9e649a53 100644 --- a/test/e2e/devices/devicegettest/device_get_test.go +++ b/test/e2e/devices/devicegettest/device_get_test.go @@ -16,7 +16,6 @@ import ( func TestCli_Devices_Get(t *testing.T) { var projectId, deviceId string var err error - var resp bool subCommand := "device" consumerToken := "" apiURL := "" @@ -50,49 +49,37 @@ func TestCli_Devices_Get(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } deviceId, err = helper.CreateTestDevice(t, projectId, "metal-cli-get-dev") + t.Cleanup(func() { + if err := helper.CleanTestDevice(t, deviceId); err != nil && + !strings.Contains(err.Error(), "Not Found") { + t.Error(err) + } + }) if err != nil { - t.Error(err) - return + t.Fatal(err) } + root.SetArgs([]string{subCommand, "get", "-i", deviceId}) rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout - t.Cleanup(func() { - if err := helper.CleanTestDevice(t, deviceId); err != nil && - !strings.Contains(err.Error(), "Not Found") { - t.Error(err) - } - }) if !strings.Contains(string(out[:]), deviceId) { - t.Error("expected output should include " + deviceId) - } - if len(projectId) != 0 && len(deviceId) != 0 { - resp, err = helper.IsDeviceStateActive(t, deviceId) - if err == nil && resp == true { - err = helper.CleanTestDevice(t, deviceId) - if err != nil { - t.Error(err) - } - err = helper.CleanTestProject(t, projectId) - if err != nil { - t.Error(err) - } - } else { - t.Error(err) - } + t.Fatal("expected output should include " + deviceId) } }, }, diff --git a/test/e2e/devices/devicereinstalltest/device_reinstall_test.go b/test/e2e/devices/devicereinstalltest/device_reinstall_test.go index abb40f47..d0737e71 100644 --- a/test/e2e/devices/devicereinstalltest/device_reinstall_test.go +++ b/test/e2e/devices/devicereinstalltest/device_reinstall_test.go @@ -48,8 +48,7 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } deviceId, err = helper.CreateTestDevice(t, projectId, "metal-cli-reinstall-dev") @@ -60,15 +59,14 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } status, err = helper.IsDeviceStateActive(t, deviceId) if err != nil { status, err = helper.IsDeviceStateActive(t, deviceId) if err != nil { - t.Error(err) + t.Fatal(err) } } @@ -76,27 +74,15 @@ func TestCli_Devices_Update(t *testing.T) { root.SetArgs([]string{subCommand, "reinstall", "--id", deviceId, "-O", "ubuntu_22_04", "--preserve-data"}) err = root.Execute() if err != nil { - t.Error(err) - return - } else { - status, err = helper.IsDeviceStateActive(t, deviceId) - // The below case will excute in both Device Active and Non-active states. - if err != nil || status { - if !status { - _, err = helper.IsDeviceStateActive(t, deviceId) - if err != nil { - t.Error(err) - } - } - err = helper.CleanTestDevice(t, deviceId) - if err != nil { - t.Error(err) - } - err = helper.CleanTestProject(t, projectId) - if err != nil { - t.Error(err) - } - } + t.Fatal(err) + } + + status, err = helper.IsDeviceStateActive(t, deviceId) + if err != nil { + t.Fatal(err) + } + if !status { + t.Fatalf("Device not yet active, %s", deviceId) } } }, diff --git a/test/e2e/devices/devicestarttest/device_start_test.go b/test/e2e/devices/devicestarttest/device_start_test.go index 244ef6eb..e220e816 100644 --- a/test/e2e/devices/devicestarttest/device_start_test.go +++ b/test/e2e/devices/devicestarttest/device_start_test.go @@ -1,7 +1,6 @@ package devicestarttest import ( - "fmt" "io" "os" "strings" @@ -51,8 +50,7 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } deviceId, err = helper.CreateTestDevice(t, projectId, "metal-cli-start-dev") @@ -63,8 +61,7 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } status, err = helper.IsDeviceStateActive(t, deviceId) @@ -89,37 +86,26 @@ func TestCli_Devices_Update(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "Device "+deviceId+" successfully started.") { - t.Error("expected output should include" + "Device " + deviceId + " successfully started." + "in the out string ") - return - } else { - status, _ = helper.IsDeviceStateActive(t, deviceId) - if err != nil || status { - if !status { - _, err = helper.IsDeviceStateActive(t, deviceId) - if err != nil { - t.Error(err) - } - } - fmt.Print("Device is Active") - err = helper.CleanTestDevice(t, deviceId) - if err != nil { - t.Error(err) - } - fmt.Print("Cleaned Test Device") - err = helper.CleanTestProject(t, projectId) - if err != nil { - t.Error(err) - } - fmt.Print("Cleaned Test Project") - } + t.Fatal("expected output should include" + "Device " + deviceId + " successfully started." + "in the out string ") + } + + status, err = helper.IsDeviceStateActive(t, deviceId) + if err != nil { + t.Fatal(err) + } + if !status { + t.Fatalf("Device not yet active, %s", deviceId) } } }, diff --git a/test/e2e/devices/devicestoptest/device_stop_test.go b/test/e2e/devices/devicestoptest/device_stop_test.go index 3d3de92a..20d7cd80 100644 --- a/test/e2e/devices/devicestoptest/device_stop_test.go +++ b/test/e2e/devices/devicestoptest/device_stop_test.go @@ -49,8 +49,7 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } deviceId, err = helper.CreateTestDevice(t, projectId, "metal-cli-stop-dev") @@ -61,39 +60,30 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } status, err := helper.IsDeviceStateActive(t, deviceId) if err != nil { - t.Error(err) - return + t.Fatal(err) } if len(projectId) != 0 && len(deviceId) != 0 && status { root.SetArgs([]string{subCommand, "stop", "--id", deviceId}) rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "Device "+deviceId+" successfully stopped.") { - t.Error("expected output should include" + "Device " + deviceId + " successfully stopped." + "in the out string ") - return - } else { - err = helper.CleanTestDevice(t, deviceId) - if err != nil { - t.Error(err) - } - err = helper.CleanTestProject(t, projectId) - if err != nil { - t.Error(err) - } + t.Fatal("expected output should include" + "Device " + deviceId + " successfully stopped." + "in the out string ") } } }, diff --git a/test/e2e/devices/deviceupdatetest/device_update_test.go b/test/e2e/devices/deviceupdatetest/device_update_test.go index 287bf468..5612b6fa 100644 --- a/test/e2e/devices/deviceupdatetest/device_update_test.go +++ b/test/e2e/devices/deviceupdatetest/device_update_test.go @@ -49,8 +49,7 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } deviceId, err = helper.CreateTestDevice(t, projectId, "metal-cli-update-dev") @@ -61,27 +60,28 @@ func TestCli_Devices_Update(t *testing.T) { } }) if err != nil { - t.Error(err) - return + t.Fatal(err) } status, err := helper.IsDeviceStateActive(t, deviceId) if err != nil { - t.Error(err) - return + t.Fatal(err) } if len(projectId) != 0 && len(deviceId) != 0 && status == true { root.SetArgs([]string{subCommand, "update", "-i", deviceId, "-H", "metal-cli-update-dev-test", "-d", "This device used for testing"}) rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) - return + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "metal-cli-update-dev-test") { t.Error("expected output should include metal-cli-update-dev-test in the out string ") } diff --git a/test/e2e/events/deviceeventstest/device_event_test.go b/test/e2e/events/deviceeventstest/device_event_test.go index 447671f1..37e767ba 100644 --- a/test/e2e/events/deviceeventstest/device_event_test.go +++ b/test/e2e/events/deviceeventstest/device_event_test.go @@ -61,12 +61,16 @@ func TestCli_Events_Get(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "Queued for provisioning") && !strings.Contains(string(out[:]), "Connected to magic install system") && !strings.Contains(string(out[:]), "Provision complete! Your device is ready to go.") { diff --git a/test/e2e/events/projecteventstest/project_events_test.go b/test/e2e/events/projecteventstest/project_events_test.go index c36a9e9a..29cf6607 100644 --- a/test/e2e/events/projecteventstest/project_events_test.go +++ b/test/e2e/events/projecteventstest/project_events_test.go @@ -50,12 +50,16 @@ func TestCli_Events_Get(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "metal-cli-events-pro") { t.Error("expected output should include metal-cli-events-pro in output string") } diff --git a/test/e2e/gateways/create_test.go b/test/e2e/gateways/create_test.go index c3f354d5..2f38eca3 100644 --- a/test/e2e/gateways/create_test.go +++ b/test/e2e/gateways/create_test.go @@ -66,20 +66,23 @@ func TestGateways_Create(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout apiClient := helper.TestClient() gateways, _, err := apiClient.MetalGatewaysApi. FindMetalGatewaysByProject(context.Background(), projectId). Execute() if err != nil { - t.Error(err) - return + t.Fatal(err) } if len(gateways.MetalGateways) != 1 { t.Error(errors.New("Gateway Not Found. Failed to create gateway")) diff --git a/test/e2e/gateways/delete_test.go b/test/e2e/gateways/delete_test.go index e8b7ca1d..bd3271af 100644 --- a/test/e2e/gateways/delete_test.go +++ b/test/e2e/gateways/delete_test.go @@ -83,12 +83,16 @@ func TestGateways_Delete(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout apiClient := helper.TestClient() gateways, _, err := apiClient.MetalGatewaysApi. diff --git a/test/e2e/gateways/retrieve_test.go b/test/e2e/gateways/retrieve_test.go index 6f163a1a..58df9859 100644 --- a/test/e2e/gateways/retrieve_test.go +++ b/test/e2e/gateways/retrieve_test.go @@ -76,12 +76,16 @@ func TestGateways_Retrieve(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout assertGatewaysCmdOutput(t, string(out[:]), metalGateway.GetId(), device.Metro.GetCode(), strconv.Itoa(int(vlan.GetVxlan()))) }, diff --git a/test/e2e/ipstest/ips_get_test.go b/test/e2e/ipstest/ips_get_test.go index 7d7b0967..1a43b6bf 100644 --- a/test/e2e/ipstest/ips_get_test.go +++ b/test/e2e/ipstest/ips_get_test.go @@ -54,12 +54,16 @@ func TestCli_Ips_Get(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), ipsId) && !strings.Contains(string(out[:]), "da") { t.Error("expected output should include " + ipsId + " da strings in the out string") diff --git a/test/e2e/ipstest/ips_request_test.go b/test/e2e/ipstest/ips_request_test.go index 5ae43226..e516a85b 100644 --- a/test/e2e/ipstest/ips_request_test.go +++ b/test/e2e/ipstest/ips_request_test.go @@ -55,12 +55,16 @@ func TestCli_Vlan_Create(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "ID") && !strings.Contains(string(out[:]), "PUBLIC") && !strings.Contains(string(out[:]), "true") { diff --git a/test/e2e/metrotest/metro_test.go b/test/e2e/metrotest/metro_test.go index 4042e27b..1688c22f 100644 --- a/test/e2e/metrotest/metro_test.go +++ b/test/e2e/metrotest/metro_test.go @@ -41,12 +41,16 @@ func TestCli_Metros(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "Seattle") && !strings.Contains(string(out[:]), "Tokyo") && !strings.Contains(string(out[:]), "Sydney") && diff --git a/test/e2e/ostest/os_test.go b/test/e2e/ostest/os_test.go index 61ffcee8..add4a628 100644 --- a/test/e2e/ostest/os_test.go +++ b/test/e2e/ostest/os_test.go @@ -41,12 +41,16 @@ func TestCli_OperatingSystem(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "RedHat Enterprise Linux 7") && !strings.Contains(string(out[:]), "RancherOS") && !strings.Contains(string(out[:]), "VMware ESXi 8.0") && diff --git a/test/e2e/plantest/plan_test.go b/test/e2e/plantest/plan_test.go index f7a53210..7954fbf6 100644 --- a/test/e2e/plantest/plan_test.go +++ b/test/e2e/plantest/plan_test.go @@ -44,12 +44,16 @@ func TestCli_Plans(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "m3.small.x86") && !strings.Contains(string(out[:]), "m3.large.x86") && !strings.Contains(string(out[:]), "c3.medium.x86") && @@ -73,12 +77,16 @@ func TestCli_Plans(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "m3.small.x86") { t.Error("expected output should include m3.small.x86 by SLUG") } @@ -97,12 +105,17 @@ func TestCli_Plans(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "m3.small.x86") && !strings.Contains(string(out[:]), "m3.large.x86") && !strings.Contains(string(out[:]), "c3.medium.x86") && diff --git a/test/e2e/ports/convert_test.go b/test/e2e/ports/convert_test.go index 4a147f34..d0efcd73 100644 --- a/test/e2e/ports/convert_test.go +++ b/test/e2e/ports/convert_test.go @@ -60,12 +60,16 @@ func TestPorts_Convert(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout assertPortCmdOutput(t, port, string(out[:]), "layer2-individual", false) }, @@ -82,12 +86,16 @@ func TestPorts_Convert(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout assertPortCmdOutput(t, port, string(out[:]), "layer2-bonded", true) }, @@ -104,12 +112,16 @@ func TestPorts_Convert(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout assertPortCmdOutput(t, port, string(out[:]), "layer3", true) }, diff --git a/test/e2e/ports/retrieve_test.go b/test/e2e/ports/retrieve_test.go index 334f03e9..eb4542bd 100644 --- a/test/e2e/ports/retrieve_test.go +++ b/test/e2e/ports/retrieve_test.go @@ -55,12 +55,16 @@ func TestPorts_Retrieve(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), port.Data.GetMac()) { t.Errorf("cmd output should contain MAC address of the port: %s", port.Data.GetMac()) diff --git a/test/e2e/ports/vlans_test.go b/test/e2e/ports/vlans_test.go index f16682e0..284f09cd 100644 --- a/test/e2e/ports/vlans_test.go +++ b/test/e2e/ports/vlans_test.go @@ -79,17 +79,20 @@ func TestPorts_VLANs(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout // wait for port to have vlans attached if err := helper.WaitForAttachVlanToPort(t, port.GetId(), true); err != nil { - t.Error(err) - return + t.Fatal(err) } assertPortCmdOutput(t, port, string(out[:]), "layer2-bonded", true) diff --git a/test/e2e/projecttest/project_test.go b/test/e2e/projecttest/project_test.go index 85db15d1..4cd05b7f 100644 --- a/test/e2e/projecttest/project_test.go +++ b/test/e2e/projecttest/project_test.go @@ -85,12 +85,16 @@ func TestCli_Project_Tests(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), projName) { t.Error("expected output should include " + projName + ", in the out string ") } @@ -119,12 +123,16 @@ func TestCli_Project_Tests(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), updateProjName) && !strings.Contains(string(out[:]), projectId) { t.Error("expected output should include " + updateProjName + projectId + ", in the out string ") @@ -152,12 +160,16 @@ func TestCli_Project_Tests(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), projName) && !strings.Contains(string(out[:]), projectId) { t.Error("expected output should include " + projName + projectId + ", in the out string ") @@ -185,12 +197,16 @@ func TestCli_Project_Tests(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), projName) && !strings.Contains(string(out[:]), projectId) { t.Error("expected output should include " + projName + projectId + ", in the out string ") @@ -218,12 +234,16 @@ func TestCli_Project_Tests(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout expectedOut := fmt.Sprintf("Project %s successfully deleted.", projectId) if !strings.Contains(string(out[:]), expectedOut) { t.Error(fmt.Errorf("expected output: '%s' but got '%s'", expectedOut, string(out))) @@ -254,12 +274,16 @@ func TestCli_Project_Tests(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), projectId) && !strings.Contains(string(out[:]), asn) && !strings.Contains(string(out[:]), dtype) { @@ -298,12 +322,16 @@ func TestCli_Project_Tests(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), projectId) && !strings.Contains(string(out[:]), asn) && !strings.Contains(string(out[:]), status) && diff --git a/test/e2e/sshtest/ssh_test.go b/test/e2e/sshtest/ssh_test.go index 17b882c3..22ca3eef 100644 --- a/test/e2e/sshtest/ssh_test.go +++ b/test/e2e/sshtest/ssh_test.go @@ -41,12 +41,16 @@ func TestCli_SshKey(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "ID") && !strings.Contains(string(out[:]), "LABEL") && !strings.Contains(string(out[:]), "CREATED") { diff --git a/test/e2e/usertest/user_test.go b/test/e2e/usertest/user_test.go index d5e6ea97..c80141a5 100644 --- a/test/e2e/usertest/user_test.go +++ b/test/e2e/usertest/user_test.go @@ -41,12 +41,16 @@ func TestCli_Users(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "ID") && !strings.Contains(string(out[:]), "FULL NAME") && !strings.Contains(string(out[:]), "EMAIL") && diff --git a/test/e2e/vlan/vlan_creat_test.go b/test/e2e/vlan/vlan_creat_test.go index 169b8318..2c57656d 100644 --- a/test/e2e/vlan/vlan_creat_test.go +++ b/test/e2e/vlan/vlan_creat_test.go @@ -50,12 +50,17 @@ func TestCli_Vlan_Create(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout + if !strings.Contains(string(out[:]), "metal-cli-vlan-test") && !strings.Contains(string(out[:]), "da") && !strings.Contains(string(out[:]), "2023") { diff --git a/test/e2e/vlan/vlan_delete_test.go b/test/e2e/vlan/vlan_delete_test.go index 110c527c..da4ac93a 100644 --- a/test/e2e/vlan/vlan_delete_test.go +++ b/test/e2e/vlan/vlan_delete_test.go @@ -51,12 +51,16 @@ func TestCli_Vlan_Clean(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "Virtual Network "+vlanId+" successfully deleted.") { t.Error("expected output should include Virtual Network " + vlanId + "successfully deleted." + "in the out string") } diff --git a/test/e2e/vlan/vlan_get_test.go b/test/e2e/vlan/vlan_get_test.go index f6002dd8..bbe9c972 100644 --- a/test/e2e/vlan/vlan_get_test.go +++ b/test/e2e/vlan/vlan_get_test.go @@ -51,12 +51,16 @@ func TestCli_Vlan_Get(t *testing.T) { rescueStdout := os.Stdout r, w, _ := os.Pipe() os.Stdout = w + t.Cleanup(func() { + w.Close() + os.Stdout = rescueStdout + }) + if err := root.Execute(); err != nil { - t.Error(err) + t.Fatal(err) } - w.Close() + out, _ := io.ReadAll(r) - os.Stdout = rescueStdout if !strings.Contains(string(out[:]), "metal-cli-vlan-get-test") && !strings.Contains(string(out[:]), "da") && !strings.Contains(string(out[:]), "2023") {