coreos
diff --git a/‎cmd/coreos-assembler.go‎
Lines changed: 6 additions & 2 deletions b/‎cmd/coreos-assembler.go‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎cmd/remote-session.go‎
Lines changed: 3 additions & 3 deletions b/‎cmd/remote-session.go‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎mantle/cmd/kola/devshell.go‎
Lines changed: 1 addition & 1 deletion b/‎mantle/cmd/kola/devshell.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎mantle/fcos/metadata.go‎
Lines changed: 5 additions & 1 deletion b/‎mantle/fcos/metadata.go‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎mantle/harness/harness.go‎
Lines changed: 11 additions & 8 deletions b/‎mantle/harness/harness.go‎
Lines changed: 11 additions & 8 deletions
diff --git a/‎mantle/harness/harness_test.go‎
Lines changed: 5 additions & 3 deletions b/‎mantle/harness/harness_test.go‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎mantle/harness/reporters/json.go‎
Lines changed: 6 additions & 2 deletions b/‎mantle/harness/reporters/json.go‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎mantle/harness/suite.go‎
Lines changed: 5 additions & 1 deletion b/‎mantle/harness/suite.go‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎mantle/harness/testresult/status.go‎
Lines changed: 5 additions & 4 deletions b/‎mantle/harness/testresult/status.go‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎mantle/harness/timeout_test.go‎
Lines changed: 2 additions & 2 deletions b/‎mantle/harness/timeout_test.go‎
Lines changed: 2 additions & 2 deletions
@@ -119,7 +119,9 @@ func initializeGlobalState(argv []string) error {
 	// Set PYTHONUNBUFFERED=1 so that we get unbuffered output. We should
 	// be able to do this on the shebang lines but env doesn't support args
 	// right now. In Fedora we should be able to use the `env -S` option.
-	os.Setenv("PYTHONUNBUFFERED", "1")
+	if err := os.Setenv("PYTHONUNBUFFERED", "1"); err != nil {
+		return fmt.Errorf("failed to set PYTHONUNBUFFERED: %w", err)
+	}
 
 	// docker/podman don't run through PAM, but we want this set for the privileged
 	// (non-virtualized) path
@@ -131,7 +133,9 @@ func initializeGlobalState(argv []string) error {
 		} else {
 			user = "cosa"
 		}
-		os.Setenv("USER", user)
+		if err := os.Setenv("USER", user); err != nil {
+			return fmt.Errorf("failed to set USER: %w", err)
+		}
 	}
 
 	// https://github.com/containers/libpod/issues/1448
 
@@ -103,9 +103,9 @@ func envVarIsSet(v string) bool {
 // environment variable error based on the given inputs.
 func envVarError(v string, required bool) error {
 	if required {
-		return fmt.Errorf("The env var %s must be defined and non-empty", v)
+		return fmt.Errorf("the env var %s must be defined and non-empty", v)
 	} else {
-		return fmt.Errorf("The env var %s must not be defined", v)
+		return fmt.Errorf("the env var %s must not be defined", v)
 	}
 }
 
@@ -231,7 +231,7 @@ func runSync(c *cobra.Command, args []string) error {
 		}
 	}
 	if found != 1 {
-		return fmt.Errorf("Must pass in a single arg with `:` prepended")
+		return fmt.Errorf("must pass in a single arg with `:` prepended")
 	}
 	// build command and execute
 	rsyncargs := []string{"-ah", "--no-owner", "--no-group", "--mkpath", "--blocking-io",
 
@@ -155,7 +155,7 @@ func runDevShellSSH(ctx context.Context, builder *platform.QemuBuilder, conf *co
 				errChan <- err
 			}
 
-			_, _ = serialLog.WriteString(fmt.Sprintf("%s\n", msg))
+			_, _ = fmt.Fprintf(serialLog, "%s\n", msg)
 			serialChan <- msg
 			checkWriteState(msg, stateChan)
 		}
 
@@ -35,7 +35,11 @@ func fetchURL(u url.URL) ([]byte, error) {
 	}
 
 	body, err := io.ReadAll(res.Body)
-	res.Body.Close()
+	if closeErr := res.Body.Close(); closeErr != nil {
+		if err == nil {
+			return nil, closeErr
+		}
+	}
 	if err != nil {
 		return nil, err
 	}
 
@@ -185,19 +185,20 @@ func (c *H) flushToParent(format string, args ...interface{}) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 
-	fmt.Fprintf(p.w, format, args...)
+	_, _ = fmt.Fprintf(p.w, format, args...)
 
 	status := c.status()
 
 	// TODO: include test numbers in TAP output.
 	if p.tap != nil {
 		name := strings.Replace(c.name, "#", "", -1)
-		if status == testresult.Fail {
-			fmt.Fprintf(p.tap, "not ok - %s\n", name)
-		} else if status == testresult.Skip {
-			fmt.Fprintf(p.tap, "ok - %s # SKIP\n", name)
-		} else {
-			fmt.Fprintf(p.tap, "ok - %s\n", name)
+		switch status {
+		case testresult.Fail:
+			_, _ = fmt.Fprintf(p.tap, "not ok - %s\n", name)
+		case testresult.Skip:
+			_, _ = fmt.Fprintf(p.tap, "ok - %s # SKIP\n", name)
+		default:
+			_, _ = fmt.Fprintf(p.tap, "ok - %s\n", name)
 		}
 	}
 
@@ -683,7 +684,9 @@ func CleanOutputDir(path string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	f.Close()
+	if err := f.Close(); err != nil {
+		return "", err
+	}
 
 	return path, nil
 }
@@ -78,7 +78,9 @@ func TestContextCancel(t *testing.T) {
 func TestSubTests(t *testing.T) {
 	// When TERM is set, we add colors to highlight tests results: '--- FAIL' will be in red '--- \033[31mFAIL\033[0m'
 	// Let's unset it here for simplicity
-	os.Unsetenv("TERM")
+	if err := os.Unsetenv("TERM"); err != nil {
+		t.Fatalf("failed to unset TERM: %v", err)
+	}
 	realTest := t
 	testCases := []struct {
 		desc   string
@@ -455,10 +457,10 @@ func TestTempFile(t *testing.T) {
 		run: func(h *H) {
 			f := h.TempFile("first")
 			testfiles = append(testfiles, f.Name())
-			f.Close()
+			_ = f.Close()
 			f = h.TempFile("second")
 			testfiles = append(testfiles, f.Name())
-			f.Close()
+			_ = f.Close()
 		},
 		timeout: DefaultTimeoutFlag,
 	}
 
@@ -84,12 +84,16 @@ func (r *jsonReporter) ReportTest(name string, subtests []string, result testres
 	})
 }
 
-func (r *jsonReporter) Output(path string) error {
+func (r *jsonReporter) Output(path string) (retErr error) {
 	f, err := os.Create(filepath.Join(path, r.filename))
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer func() {
+		if closeErr := f.Close(); closeErr != nil && retErr == nil {
+			retErr = closeErr
+		}
+	}()
 
 	return json.NewEncoder(f).Encode(r)
 }
 
@@ -207,7 +207,11 @@ func (s *Suite) Run() (err error) {
 	if err != nil {
 		return err
 	}
-	defer tap.Close()
+	defer func() {
+		if err2 := tap.Close(); err == nil {
+			err = err2
+		}
+	}()
 	if _, err := fmt.Fprintf(tap, "1..%d\n", len(s.tests)); err != nil {
 		return err
 	}
 
@@ -36,13 +36,14 @@ func (s TestResult) Display() string {
 	green := "\033[32m"
 	reset := "\033[0m"
 
-	if s == Fail {
+	switch s {
+	case Fail:
 		return red + string(s) + reset
-	} else if s == Warn {
+	case Warn:
 		return yellow + string(s) + reset
-	} else if s == Skip {
+	case Skip:
 		return blue + string(s) + reset
-	} else {
+	default:
 		return green + string(s) + reset
 	}
 }
@@ -50,7 +50,7 @@ func TestTimeoutBasic(t *testing.T) {
 	// In the kola tests, we check for timeouts in the SSH code
 	// to exit running goroutines
 
-	if !(timeToRun-slack < total && total < timeToRun+slack) {
+	if timeToRun-slack >= total || total >= timeToRun+slack {
 		t.Errorf("Expected: %v +/- %v, Got: %v", timeToRun, slack, total)
 	}
 
@@ -80,7 +80,7 @@ func TestTimeoutNoInterrupt(t *testing.T) {
 	}
 	total := time.Since(start)
 
-	if !(timeToRun-slack < total && total < timeToRun+slack) {
+	if timeToRun-slack >= total || total >= timeToRun+slack {
 		t.Errorf("Expected: %v +/- %v, Got: %v", timeToRun, slack, total)
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,9 @@ func envVarIsSet(v string) bool {`
`103`	`103`	`// environment variable error based on the given inputs.`
`104`	`104`	`func envVarError(v string, required bool) error {`
`105`	`105`	`if required {`
`106`		`- return fmt.Errorf("The env var %s must be defined and non-empty", v)`
	`106`	`+ return fmt.Errorf("the env var %s must be defined and non-empty", v)`
`107`	`107`	`} else {`
`108`		`- return fmt.Errorf("The env var %s must not be defined", v)`
	`108`	`+ return fmt.Errorf("the env var %s must not be defined", v)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`@@ -231,7 +231,7 @@ func runSync(c *cobra.Command, args []string) error {`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`	`if found != 1 {`
`234`		- return fmt.Errorf("Must pass in a single arg with `:` prepended")
	`234`	+ return fmt.Errorf("must pass in a single arg with `:` prepended")
`235`	`235`	`}`
`236`	`236`	`// build command and execute`
`237`	`237`	`rsyncargs := []string{"-ah", "--no-owner", "--no-group", "--mkpath", "--blocking-io",`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func runDevShellSSH(ctx context.Context, builder platform.QemuBuilder, conf co`
`155`	`155`	`errChan <- err`
`156`	`156`	`}`
`157`	`157`
`158`		`- _, _ = serialLog.WriteString(fmt.Sprintf("%s\n", msg))`
	`158`	`+ _, _ = fmt.Fprintf(serialLog, "%s\n", msg)`
`159`	`159`	`serialChan <- msg`
`160`	`160`	`checkWriteState(msg, stateChan)`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ func fetchURL(u url.URL) ([]byte, error) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`body, err := io.ReadAll(res.Body)`
`38`		`- res.Body.Close()`
	`38`	`+ if closeErr := res.Body.Close(); closeErr != nil {`
	`39`	`+ if err == nil {`
	`40`	`+ return nil, closeErr`
	`41`	`+ }`
	`42`	`+ }`
`39`	`43`	`if err != nil {`
`40`	`44`	`return nil, err`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,16 @@ func (r *jsonReporter) ReportTest(name string, subtests []string, result testres`
`84`	`84`	`})`
`85`	`85`	`}`
`86`	`86`
`87`		`-func (r *jsonReporter) Output(path string) error {`
	`87`	`+func (r *jsonReporter) Output(path string) (retErr error) {`
`88`	`88`	`f, err := os.Create(filepath.Join(path, r.filename))`
`89`	`89`	`if err != nil {`
`90`	`90`	`return err`
`91`	`91`	`}`
`92`		`- defer f.Close()`
	`92`	`+ defer func() {`
	`93`	`+ if closeErr := f.Close(); closeErr != nil && retErr == nil {`
	`94`	`+ retErr = closeErr`
	`95`	`+ }`
	`96`	`+ }()`
`93`	`97`
`94`	`98`	`return json.NewEncoder(f).Encode(r)`
`95`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,11 @@ func (s *Suite) Run() (err error) {`
`207`	`207`	`if err != nil {`
`208`	`208`	`return err`
`209`	`209`	`}`
`210`		`- defer tap.Close()`
	`210`	`+ defer func() {`
	`211`	`+ if err2 := tap.Close(); err == nil {`
	`212`	`+ err = err2`
	`213`	`+ }`
	`214`	`+ }()`
`211`	`215`	`if _, err := fmt.Fprintf(tap, "1..%d\n", len(s.tests)); err != nil {`
`212`	`216`	`return err`
`213`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func TestTimeoutBasic(t *testing.T) {`
`50`	`50`	`// In the kola tests, we check for timeouts in the SSH code`
`51`	`51`	`// to exit running goroutines`
`52`	`52`
`53`		`- if !(timeToRun-slack < total && total < timeToRun+slack) {`
	`53`	`+ if timeToRun-slack >= total \|\| total >= timeToRun+slack {`
`54`	`54`	`t.Errorf("Expected: %v +/- %v, Got: %v", timeToRun, slack, total)`
`55`	`55`	`}`
`56`	`56`
`@@ -80,7 +80,7 @@ func TestTimeoutNoInterrupt(t *testing.T) {`
`80`	`80`	`}`
`81`	`81`	`total := time.Since(start)`
`82`	`82`
`83`		`- if !(timeToRun-slack < total && total < timeToRun+slack) {`
	`83`	`+ if timeToRun-slack >= total \|\| total >= timeToRun+slack {`
`84`	`84`	`t.Errorf("Expected: %v +/- %v, Got: %v", timeToRun, slack, total)`
`85`	`85`	`}`
`86`	`86`	`}`