removed os exit code control from tests

Author: benPearce1

pkg/cmd/api/api.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"io"
 	"net/http"
-	"os"
 
 	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/OctopusDeploy/cli/pkg/apiclient"
@@ -16,9 +15,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// OsExit is a variable so tests can stub it to avoid terminating the process.
-var OsExit = os.Exit
-
 func NewCmdAPI(f factory.Factory) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "api <url>",

pkg/cmd/api/api_test.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"testing"
 
-	apiPkg "github.com/OctopusDeploy/cli/pkg/cmd/api"
 	cmdRoot "github.com/OctopusDeploy/cli/pkg/cmd/root"
 	"github.com/OctopusDeploy/cli/test/testutil"
 	"github.com/spf13/cobra"
@@ -51,12 +50,6 @@ func TestApiCommand(t *testing.T) {
 		}},
 
 		{"prints error response body on non-2xx status", func(t *testing.T, api *testutil.MockHttpServer, rootCmd *cobra.Command, stdOut *bytes.Buffer, stdErr *bytes.Buffer) {
-			// Stub os.Exit so the test doesn't terminate the process
-			origExit := apiPkg.OsExit
-			var exitCode int
-			apiPkg.OsExit = func(code int) { exitCode = code }
-			defer func() { apiPkg.OsExit = origExit }()
-
 			cmdReceiver := testutil.GoBegin2(func() (*cobra.Command, error) {
 				defer api.Close()
 				rootCmd.SetArgs([]string{"api", "/api/nonexistent"})
@@ -70,9 +63,8 @@ func TestApiCommand(t *testing.T) {
 			})
 
 			_, err := testutil.ReceivePair(cmdReceiver)
-			assert.Nil(t, err)
-			assert.Equal(t, http.StatusNotFound, exitCode)
-			assert.Contains(t, stdOut.String(), `"ErrorMessage": "Not found"`)
+			assert.NotNil(t, err)
+			assert.Contains(t, err.Error(), "Not found")
 		}},
 
 		{"outputs raw body when response is not valid JSON", func(t *testing.T, api *testutil.MockHttpServer, rootCmd *cobra.Command, stdOut *bytes.Buffer, stdErr *bytes.Buffer) {