Inline ifs and change log.Fatalf + Error() calls by log.Fatal

testbed/testbed/child_process.go

@@ -375,9 +375,8 @@ func (cp *ChildProcess) WatchResourceConsumption() error {
 			cp.fetchCPUUsage()
 
 			if err := cp.checkAllowedResourceUsage(); err != nil {
-				_, errStop := cp.Stop()
-				if errStop != nil {
-					log.Printf("Failed to stop child process: %v", errStop)
+				if _, errStop := cp.Stop(); errStop != nil {
+					log.Printf("Failed to stop child process: %v", err)
 				}
 				return err
 			}

testbed/testbed/results.go

@@ -61,14 +61,13 @@ func (r *PerformanceResults) Init(resultsDir string) {
 	r.perTestResults = []*PerformanceTestResult{}
 
 	// Create resultsSummary file
-	var err error
-	err = os.MkdirAll(resultsDir, os.FileMode(0755))
-	if err != nil {
-		log.Fatalf(err.Error())
+	if err := os.MkdirAll(resultsDir, os.FileMode(0755)); err != nil {
+		log.Fatal(err)
 	}
+	var err error
 	r.resultsFile, err = os.Create(path.Join(r.resultsDir, "TESTRESULTS.md"))
 	if err != nil {
-		log.Fatalf(err.Error())
+		log.Fatal(err)
 	}
 
 	// Write the header
@@ -149,12 +148,12 @@ func (r *CorrectnessResults) Init(resultsDir string) {
 
 	// Create resultsSummary file
 	if err := os.MkdirAll(resultsDir, os.FileMode(0755)); err != nil {
-		log.Fatalf(err.Error())
+		log.Fatal(err)
 	}
 	var err error
 	r.resultsFile, err = os.Create(path.Join(r.resultsDir, "CORRECTNESSRESULTS.md"))
 	if err != nil {
-		log.Fatalf(err.Error())
+		log.Fatal(err)
 	}
 
 	// Write the header

testbed/testbed/test_case.go

@@ -207,8 +207,7 @@ func (tc *TestCase) StartAgent(args ...string) {
 
 // StopAgent stops agent process.
 func (tc *TestCase) StopAgent() {
-	_, err := tc.agentProc.Stop()
-	if err != nil {
+	if _, err := tc.agentProc.Stop(); err != nil {
 		tc.indicateError(err)
 	}
 }