coreos
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/cmd/ore/gcloud/upload.go‎
Lines changed: 3 additions & 3 deletions b/‎mantle/cmd/ore/gcloud/upload.go‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎mantle/harness/harness.go‎
Lines changed: 5 additions & 4 deletions b/‎mantle/harness/harness.go‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎mantle/harness/harness_test.go‎
Lines changed: 2 additions & 2 deletions b/‎mantle/harness/harness_test.go‎
Lines changed: 2 additions & 2 deletions
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: 3 additions & 3 deletions b/‎mantle/harness/timeout_test.go‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎mantle/kola/cluster/cluster.go‎
Lines changed: 1 addition & 1 deletion b/‎mantle/kola/cluster/cluster.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎mantle/kola/harness.go‎
Lines changed: 6 additions & 6 deletions b/‎mantle/kola/harness.go‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎mantle/kola/tests/coretest/core.go‎
Lines changed: 3 additions & 2 deletions b/‎mantle/kola/tests/coretest/core.go‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎mantle/kola/tests/crio/crio.go‎
Lines changed: 1 addition & 1 deletion b/‎mantle/kola/tests/crio/crio.go‎
Lines changed: 1 addition & 1 deletion
@@ -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)
 		}
 
@@ -220,11 +220,11 @@ func gcpSanitize(name string) string {
 	}
 
 	// remove incompatible chars from version.txt
-	name = strings.Replace(name, ".", "-", -1)
-	name = strings.Replace(name, "+", "-", -1)
+	name = strings.ReplaceAll(name, ".", "-")
+	name = strings.ReplaceAll(name, "+", "-")
 
 	// remove forward slashes likely from prefix
-	name = strings.Replace(name, "/", "-", -1)
+	name = strings.ReplaceAll(name, "/", "-")
 
 	// ensure name starts with [a-z]
 	char := name[0]
 
@@ -191,12 +191,13 @@ func (c *H) flushToParent(format string, args ...interface{}) {
 
 	// TODO: include test numbers in TAP output.
 	if p.tap != nil {
-		name := strings.Replace(c.name, "#", "", -1)
-		if status == testresult.Fail {
+		name := strings.ReplaceAll(c.name, "#", "")
+		switch status {
+		case testresult.Fail:
 			fmt.Fprintf(p.tap, "not ok - %s\n", name)
-		} else if status == testresult.Skip {
+		case testresult.Skip:
 			fmt.Fprintf(p.tap, "ok - %s # SKIP\n", name)
-		} else {
+		default:
 			fmt.Fprintf(p.tap, "ok - %s\n", name)
 		}
 	}
 
@@ -326,8 +326,8 @@ func TestSubTests(t *testing.T) {
 }
 
 func makeRegexp(s string) string {
-	s = strings.Replace(s, ":NNN:", `:\d\d\d:`, -1)
-	s = strings.Replace(s, "(N.NNs)", `\(\d*\.\d*s\)`, -1)
+	s = strings.ReplaceAll(s, ":NNN:", `:\d\d\d:`)
+	s = strings.ReplaceAll(s, "(N.NNs)", `\(\d*\.\d*s\)`)
 	return s
 }
 
 
@@ -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)
 	}
 }
@@ -122,7 +122,7 @@ func TestTimeoutMultipleTests(t *testing.T) {
 	}
 	total := time.Since(start)
 
-	if !(totalTime-slack < total && total < totalTime+slack) {
+	if totalTime-slack >= total || total >= totalTime+slack {
 		t.Errorf("Expected: %v +/- %v, Got: %v", totalTime, slack, total)
 	}
 }
@@ -145,7 +145,7 @@ func (t *TestCluster) SSH(m platform.Machine, cmd string) ([]byte, error) {
 	errMsg := fmt.Sprintf("ssh: %s", cmd)
 	// If f does not before the test timeout, the RunWithExecTimeoutCheck
 	// will end this goroutine and mark the test as failed
-	t.H.RunWithExecTimeoutCheck(f, errMsg)
+	t.RunWithExecTimeoutCheck(f, errMsg)
 	if len(stderr) > 0 {
 		for _, line := range strings.Split(string(stderr), "\n") {
 			t.Log(line)
 
@@ -1693,7 +1693,7 @@ func makeNonExclusiveTest(bucket int, tests []*register.Test, flight platform.Fl
 			for _, t := range tests {
 				t := t
 				run := func(h *harness.H) {
-					tcluster.H.NonExclusiveTestStarted()
+					tcluster.NonExclusiveTestStarted()
 					testResults.add(h)
 					// tcluster has a reference to the wrapper's harness
 					// We need a new TestCluster that has a reference to the
@@ -1712,16 +1712,16 @@ func makeNonExclusiveTest(bucket int, tests []*register.Test, flight platform.Fl
 						defer collectLogsExternalTest(h, t, newTC)
 					}
 					if IsWarningOnFailure(t.Name) {
-						newTC.H.WarningOnFailure()
+						newTC.WarningOnFailure()
 					}
 
 					t.Run(newTC)
 				}
 				// Each non-exclusive test is run as a subtest of this wrapper test
 				if t.Timeout == harness.DefaultTimeoutFlag {
-					tcluster.H.RunTimeout(t.Name, run, time.Duration(1)*time.Minute)
+					tcluster.RunTimeout(t.Name, run, time.Duration(1)*time.Minute)
 				} else {
-					tcluster.H.RunTimeout(t.Name, run, t.Timeout)
+					tcluster.RunTimeout(t.Name, run, t.Timeout)
 				}
 			}
 		},
@@ -1797,7 +1797,7 @@ func runTest(h *harness.H, t *register.Test, pltfrm string, flight platform.Flig
 	}()
 
 	if t.ClusterSize > 0 {
-		var userdata *conf.UserData = t.UserData
+		var userdata = t.UserData
 
 		options := platform.MachineOptions{
 			MultiPathDisk:             t.MultiPathDisk,
@@ -1851,7 +1851,7 @@ func runTest(h *harness.H, t *register.Test, pltfrm string, flight platform.Flig
 	}
 
 	if IsWarningOnFailure(t.Name) {
-		tcluster.H.WarningOnFailure()
+		tcluster.WarningOnFailure()
 	}
 
 	// Note that we passed in SkipStartMachine=true in our machine
 
@@ -327,9 +327,10 @@ func TestUseradd() error {
 // Test that /etc/machine-id isn't empty or COREOS_BLANK_MACHINE_ID
 func TestMachineID() error {
 	id := MachineID()
-	if id == "" {
+	switch id {
+	case "":
 		return fmt.Errorf("machine-id is empty")
-	} else if id == "COREOS_BLANK_MACHINE_ID" {
+	case "COREOS_BLANK_MACHINE_ID":
 		return fmt.Errorf("machine-id is %s", id)
 	}
 	return nil
 
@@ -328,7 +328,7 @@ func crioNetwork(c cluster.TestCluster) {
 			}
 
 			exit, ok := err.(*ssh.ExitError)
-			if !ok || exit.Waitmsg.ExitStatus() != 1 { // 1 is the expected exit of grep -q
+			if !ok || exit.ExitStatus() != 1 { // 1 is the expected exit of grep -q
 				return err
 			}
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
`@@ -326,8 +326,8 @@ func TestSubTests(t *testing.T) {`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`func makeRegexp(s string) string {`
`329`		- s = strings.Replace(s, ":NNN:", `:\d\d\d:`, -1)
`330`		- s = strings.Replace(s, "(N.NNs)", `\(\d\.\ds\)`, -1)
	`329`	+ s = strings.ReplaceAll(s, ":NNN:", `:\d\d\d:`)
	`330`	+ s = strings.ReplaceAll(s, "(N.NNs)", `\(\d\.\ds\)`)
`331`	`331`	`return s`
`332`	`332`	`}`
`333`	`333`
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`	`}`
`@@ -122,7 +122,7 @@ func TestTimeoutMultipleTests(t *testing.T) {`
`122`	`122`	`}`
`123`	`123`	`total := time.Since(start)`
`124`	`124`
`125`		`- if !(totalTime-slack < total && total < totalTime+slack) {`
	`125`	`+ if totalTime-slack >= total \|\| total >= totalTime+slack {`
`126`	`126`	`t.Errorf("Expected: %v +/- %v, Got: %v", totalTime, slack, total)`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1693,7 +1693,7 @@ func makeNonExclusiveTest(bucket int, tests []*register.Test, flight platform.Fl`
`1693`	`1693`	`for _, t := range tests {`
`1694`	`1694`	`t := t`
`1695`	`1695`	`run := func(h *harness.H) {`
`1696`		`- tcluster.H.NonExclusiveTestStarted()`
	`1696`	`+ tcluster.NonExclusiveTestStarted()`
`1697`	`1697`	`testResults.add(h)`
`1698`	`1698`	`// tcluster has a reference to the wrapper's harness`
`1699`	`1699`	`// We need a new TestCluster that has a reference to the`
`@@ -1712,16 +1712,16 @@ func makeNonExclusiveTest(bucket int, tests []*register.Test, flight platform.Fl`
`1712`	`1712`	`defer collectLogsExternalTest(h, t, newTC)`
`1713`	`1713`	`}`
`1714`	`1714`	`if IsWarningOnFailure(t.Name) {`
`1715`		`- newTC.H.WarningOnFailure()`
	`1715`	`+ newTC.WarningOnFailure()`
`1716`	`1716`	`}`
`1717`	`1717`
`1718`	`1718`	`t.Run(newTC)`
`1719`	`1719`	`}`
`1720`	`1720`	`// Each non-exclusive test is run as a subtest of this wrapper test`
`1721`	`1721`	`if t.Timeout == harness.DefaultTimeoutFlag {`
`1722`		`- tcluster.H.RunTimeout(t.Name, run, time.Duration(1)*time.Minute)`
	`1722`	`+ tcluster.RunTimeout(t.Name, run, time.Duration(1)*time.Minute)`
`1723`	`1723`	`} else {`
`1724`		`- tcluster.H.RunTimeout(t.Name, run, t.Timeout)`
	`1724`	`+ tcluster.RunTimeout(t.Name, run, t.Timeout)`
`1725`	`1725`	`}`
`1726`	`1726`	`}`
`1727`	`1727`	`},`
`@@ -1797,7 +1797,7 @@ func runTest(h harness.H, t register.Test, pltfrm string, flight platform.Flig`
`1797`	`1797`	`}()`
`1798`	`1798`
`1799`	`1799`	`if t.ClusterSize > 0 {`
`1800`		`- var userdata *conf.UserData = t.UserData`
	`1800`	`+ var userdata = t.UserData`
`1801`	`1801`
`1802`	`1802`	`options := platform.MachineOptions{`
`1803`	`1803`	`MultiPathDisk: t.MultiPathDisk,`
`@@ -1851,7 +1851,7 @@ func runTest(h harness.H, t register.Test, pltfrm string, flight platform.Flig`
`1851`	`1851`	`}`
`1852`	`1852`
`1853`	`1853`	`if IsWarningOnFailure(t.Name) {`
`1854`		`- tcluster.H.WarningOnFailure()`
	`1854`	`+ tcluster.WarningOnFailure()`
`1855`	`1855`	`}`
`1856`	`1856`
`1857`	`1857`	`// Note that we passed in SkipStartMachine=true in our machine`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ func crioNetwork(c cluster.TestCluster) {`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`exit, ok := err.(*ssh.ExitError)`
`331`		`- if !ok \|\| exit.Waitmsg.ExitStatus() != 1 { // 1 is the expected exit of grep -q`
	`331`	`+ if !ok \|\| exit.ExitStatus() != 1 { // 1 is the expected exit of grep -q`
`332`	`332`	`return err`
`333`	`333`	`}`
`334`	`334`