Fix integration test

redhat-developer · Apr 11, 2023 · e9f8d68 · e9f8d68
1 parent 2c950d9
commit e9f8d68
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/pkg/odo/cli/dev/dev.go b/pkg/odo/cli/dev/dev.go
@@ -193,6 +193,7 @@ func (o *DevOptions) Run(ctx context.Context) (err error) {
 
 	err = o.clientset.StateClient.Init(ctx)
 	if err != nil {
+		err = fmt.Errorf("unable to save state file: %v", err)
 		return err
 	}
 

diff --git a/pkg/state/state.go b/pkg/state/state.go
@@ -137,10 +137,8 @@ func (o *State) read(platform string) (Content, error) {
 		if err != nil {
 			return Content{}, err
 		}
-		err = json.Unmarshal(jsonContent, &content)
-		if err != nil {
-			return Content{}, err
-		}
+		// Ignore error, to handle empty file
+		_ = json.Unmarshal(jsonContent, &content)
 		if content.Platform == platform {
 			break
 		} else {
@@ -194,10 +192,8 @@ func (o *State) isFreeOrOwnedBy(pid int) (bool, error) {
 		return false, err
 	}
 	var savedContent Content
-	err = json.Unmarshal(jsonContent, &savedContent)
-	if err != nil {
-		return false, err
-	}
+	// Ignore error, to handle empty file
+	_ = json.Unmarshal(jsonContent, &savedContent)
 	if savedContent.PID == 0 {
 		// PID is 0 in file, it is free
 		return true, nil
@@ -240,10 +236,8 @@ func (o *State) checkFirstInPlatform(ctx context.Context) error {
 			return err
 		}
 		var content Content
-		err = json.Unmarshal(jsonContent, &content)
-		if err != nil {
-			return err
-		}
+		// Ignore error, to handle empty file
+		_ = json.Unmarshal(jsonContent, &content)
 		if content.Platform == platform {
 			if content.PID == pid {
 				continue

diff --git a/tests/integration/cmd_dev_test.go b/tests/integration/cmd_dev_test.go
@@ -268,7 +268,7 @@ var _ = Describe("odo dev command tests", func() {
 				stdout := res.Out()
 				stderr := res.Err()
 				Expect(stdout).To(ContainSubstring("Cleaning"))
-				Expect(stderr).To(ContainSubstring("unable to save forwarded ports to state file"))
+				Expect(stderr).To(ContainSubstring("unable to save state file"))
 			})
 		})