s/RestoreStandardFileDescriptors/TearDown/g

Signed-off-by: Eduardo Apolinario <[email protected]>
flyteorg · May 3, 2024 · 8fb8a99 · 8fb8a99
1 parent c061933
commit 8fb8a99
Show file tree

Hide file tree

Showing 28 changed files with 136 additions and 136 deletions.
diff --git a/flytectl/cmd/compile/compile_test.go b/flytectl/cmd/compile/compile_test.go
@@ -31,7 +31,7 @@ func TestCompileCommand(t *testing.T) {
 	compileCfg.File = "testdata/valid-package.tgz"
 	var setup = u.Setup
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 	compileCmd := CreateCompileCommand()["compile"]
 	err := compileCmd.CmdFunc(context.Background(), []string{}, s.CmdCtx)
 	assert.Nil(t, err, "compiling via cmd returns err")

diff --git a/flytectl/cmd/create/execution_test.go b/flytectl/cmd/create/execution_test.go
@@ -32,7 +32,7 @@ func (s *createSuite) SetupTest() {
 }
 
 func (s *createSuite) TearDownTest() {
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 	orig := s.originalExecConfig
 	executionConfig = &orig
 	s.MockAdminClient.AssertExpectations(s.T())

diff --git a/flytectl/cmd/create/execution_util_test.go b/flytectl/cmd/create/execution_util_test.go
@@ -48,7 +48,7 @@ func createExecutionUtilSetup() {
 
 func TestCreateExecutionForRelaunch(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createExecutionUtilSetup()
 	s.MockAdminClient.OnRelaunchExecutionMatch(s.Ctx, relaunchRequest).Return(executionCreateResponse, nil)
@@ -58,7 +58,7 @@ func TestCreateExecutionForRelaunch(t *testing.T) {
 
 func TestCreateExecutionForRelaunchNotFound(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createExecutionUtilSetup()
 	s.MockAdminClient.OnRelaunchExecutionMatch(s.Ctx, relaunchRequest).Return(nil, errors.New("unknown execution"))
@@ -70,7 +70,7 @@ func TestCreateExecutionForRelaunchNotFound(t *testing.T) {
 
 func TestCreateExecutionForRecovery(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createExecutionUtilSetup()
 	s.MockAdminClient.OnRecoverExecutionMatch(s.Ctx, recoverRequest).Return(executionCreateResponse, nil)
@@ -80,7 +80,7 @@ func TestCreateExecutionForRecovery(t *testing.T) {
 
 func TestCreateExecutionForRecoveryNotFound(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createExecutionUtilSetup()
 	s.MockAdminClient.OnRecoverExecutionMatch(s.Ctx, recoverRequest).Return(nil, errors.New("unknown execution"))
@@ -92,7 +92,7 @@ func TestCreateExecutionForRecoveryNotFound(t *testing.T) {
 func TestCreateExecutionRequestForWorkflow(t *testing.T) {
 	t.Run("successful", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		launchPlan := &admin.LaunchPlan{}
@@ -103,7 +103,7 @@ func TestCreateExecutionRequestForWorkflow(t *testing.T) {
 	})
 	t.Run("successful with envs", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		launchPlan := &admin.LaunchPlan{}
@@ -117,7 +117,7 @@ func TestCreateExecutionRequestForWorkflow(t *testing.T) {
 	})
 	t.Run("successful with empty envs", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		launchPlan := &admin.LaunchPlan{}
@@ -131,7 +131,7 @@ func TestCreateExecutionRequestForWorkflow(t *testing.T) {
 	})
 	t.Run("failed literal conversion", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		launchPlan := &admin.LaunchPlan{
@@ -149,7 +149,7 @@ func TestCreateExecutionRequestForWorkflow(t *testing.T) {
 	})
 	t.Run("failed fetch", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		s.FetcherExt.OnFetchLPVersionMatch(s.Ctx, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, fmt.Errorf("failed"))
@@ -160,7 +160,7 @@ func TestCreateExecutionRequestForWorkflow(t *testing.T) {
 	})
 	t.Run("with security context", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		executionConfig.KubeServiceAcct = "default"
@@ -177,7 +177,7 @@ func TestCreateExecutionRequestForWorkflow(t *testing.T) {
 func TestCreateExecutionRequestForTask(t *testing.T) {
 	t.Run("successful", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		task := &admin.Task{
@@ -192,7 +192,7 @@ func TestCreateExecutionRequestForTask(t *testing.T) {
 	})
 	t.Run("successful with envs", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		task := &admin.Task{
@@ -210,7 +210,7 @@ func TestCreateExecutionRequestForTask(t *testing.T) {
 	})
 	t.Run("successful with empty envs", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		task := &admin.Task{
@@ -228,7 +228,7 @@ func TestCreateExecutionRequestForTask(t *testing.T) {
 	})
 	t.Run("failed literal conversion", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		task := &admin.Task{
@@ -254,7 +254,7 @@ func TestCreateExecutionRequestForTask(t *testing.T) {
 	})
 	t.Run("failed fetch", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		s.FetcherExt.OnFetchTaskVersionMatch(s.Ctx, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, fmt.Errorf("failed"))
@@ -265,7 +265,7 @@ func TestCreateExecutionRequestForTask(t *testing.T) {
 	})
 	t.Run("with security context", func(t *testing.T) {
 		s := setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		createExecutionUtilSetup()
 		executionConfig.KubeServiceAcct = "default"
@@ -303,7 +303,7 @@ func Test_resolveOverrides(t *testing.T) {
 
 func TestCreateExecutionForRelaunchOverwritingCache(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createExecutionUtilSetup()
 	executionConfig.OverwriteCache = true

diff --git a/flytectl/cmd/create/project_test.go b/flytectl/cmd/create/project_test.go
@@ -41,11 +41,11 @@ func createProjectSetup() {
 }
 func TestCreateProjectFunc(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createProjectSetup()
 	defer s.TearDownAndVerify(t, "project created successfully.")
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 	project.DefaultProjectConfig.ID = projectValue
 	project.DefaultProjectConfig.Name = projectValue
 	project.DefaultProjectConfig.Labels = map[string]string{}
@@ -58,11 +58,11 @@ func TestCreateProjectFunc(t *testing.T) {
 
 func TestEmptyProjectID(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createProjectSetup()
 	defer s.TearDownAndVerify(t, "")
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 	project.DefaultProjectConfig = &project.ConfigProject{}
 	s.MockAdminClient.OnRegisterProjectMatch(s.Ctx, projectRegisterRequest).Return(nil, nil)
 	err := createProjectsCommand(s.Ctx, []string{}, s.CmdCtx)
@@ -72,11 +72,11 @@ func TestEmptyProjectID(t *testing.T) {
 
 func TestEmptyProjectName(t *testing.T) {
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	createProjectSetup()
 	defer s.TearDownAndVerify(t, "")
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 	project.DefaultProjectConfig.ID = projectValue
 	project.DefaultProjectConfig.Labels = map[string]string{}
 	project.DefaultProjectConfig.Description = ""

diff --git a/flytectl/cmd/demo/exec_test.go b/flytectl/cmd/demo/exec_test.go
@@ -53,7 +53,7 @@ func TestSandboxClusterExecWithoutCmd(t *testing.T) {
 	mockDocker := &mocks.Docker{}
 	reader := bufio.NewReader(strings.NewReader("test"))
 	s := testutils.Setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	ctx := s.Ctx
 

diff --git a/flytectl/cmd/demo/status_test.go b/flytectl/cmd/demo/status_test.go
@@ -15,15 +15,15 @@ func TestDemoStatus(t *testing.T) {
 	t.Run("Demo status with zero result", func(t *testing.T) {
 		mockDocker := &mocks.Docker{}
 		s := testutils.Setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 		mockDocker.OnContainerList(s.Ctx, types.ContainerListOptions{All: true}).Return([]types.Container{}, nil)
 		docker.Client = mockDocker
 		err := demoClusterStatus(s.Ctx, []string{}, s.CmdCtx)
 		assert.Nil(t, err)
 	})
 	t.Run("Demo status with running", func(t *testing.T) {
 		s := testutils.Setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 		ctx := s.Ctx
 		mockDocker := &mocks.Docker{}
 		mockDocker.OnContainerList(ctx, types.ContainerListOptions{All: true}).Return([]types.Container{

diff --git a/flytectl/cmd/demo/teardown_test.go b/flytectl/cmd/demo/teardown_test.go
@@ -80,7 +80,7 @@ func TestTearDownClusterFunc(t *testing.T) {
 	_ = util.SetupFlyteDir()
 	_ = util.WriteIntoFile([]byte("data"), configutil.FlytectlConfig)
 	s := testutils.Setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	ctx := s.Ctx
 	mockDocker := &mocks.Docker{}

diff --git a/flytectl/cmd/get/execution_test.go b/flytectl/cmd/get/execution_test.go
@@ -32,7 +32,7 @@ func getExecutionSetup() {
 func TestListExecutionFunc(t *testing.T) {
 	getExecutionSetup()
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	executionResponse := &admin.Execution{
 		Id: &core.WorkflowExecutionIdentifier{
@@ -95,7 +95,7 @@ func TestListExecutionFuncWithError(t *testing.T) {
 		},
 	}
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	s.FetcherExt.OnListExecutionMatch(s.Ctx, mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("executions NotFound"))
 	err := getExecutionFunc(s.Ctx, []string{}, s.CmdCtx)
@@ -132,7 +132,7 @@ func TestGetExecutionFunc(t *testing.T) {
 	}
 	args := []string{executionNameValue}
 	s := setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	s.FetcherExt.OnFetchExecutionMatch(s.Ctx, mock.Anything, mock.Anything, mock.Anything).Return(executionResponse, nil)
 	err := getExecutionFunc(s.Ctx, args, s.CmdCtx)
@@ -142,7 +142,7 @@ func TestGetExecutionFunc(t *testing.T) {
 
 func TestGetExecutionFuncForDetails(t *testing.T) {
 	s := testutils.Setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 	getExecutionSetup()
 	ctx := s.Ctx
 	mockCmdCtx := s.CmdCtx
@@ -159,7 +159,7 @@ func TestGetExecutionFuncForDetails(t *testing.T) {
 func TestGetExecutionFuncWithIOData(t *testing.T) {
 	t.Run("successful inputs outputs", func(t *testing.T) {
 		s := testutils.Setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		getExecutionSetup()
 		ctx := s.Ctx
@@ -225,7 +225,7 @@ func TestGetExecutionFuncWithIOData(t *testing.T) {
 	})
 	t.Run("fetch data error from admin", func(t *testing.T) {
 		s := testutils.Setup()
-		defer s.RestoreStandardFileDescriptors()
+		defer s.TearDown()
 
 		getExecutionSetup()
 		ctx := s.Ctx
@@ -267,7 +267,7 @@ func TestGetExecutionFuncWithIOData(t *testing.T) {
 		args := []string{dummyExec}
 		for _, tt := range tests {
 			s := testutils.Setup()
-			defer s.RestoreStandardFileDescriptors()
+			defer s.TearDown()
 
 			config.GetConfig().Output = tt.outputFormat
 			execution.DefaultConfig.NodeID = tt.nodeID
@@ -368,7 +368,7 @@ func TestGetExecutionFuncWithError(t *testing.T) {
 
 	args := []string{executionNameValue}
 	s := testutils.Setup()
-	defer s.RestoreStandardFileDescriptors()
+	defer s.TearDown()
 
 	s.FetcherExt.OnFetchExecutionMatch(s.Ctx, mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("execution NotFound"))
 	err := getExecutionFunc(s.Ctx, args, s.CmdCtx)