better logging

so you can see timing info everywhere needed

Author: Dieterbe

stacktest/tests/end2end_carbon/end2end_carbon_test.go

@@ -1,7 +1,6 @@
 package end2end_carbon
 
 import (
-	"fmt"
 	"log"
 	"os"
 	"os/exec"
@@ -25,7 +24,7 @@ var fm *fakemetrics.FakeMetrics
 const metricsPerSecond = 1000
 
 func TestMain(m *testing.M) {
-	fmt.Println("launching docker-dev stack...")
+	log.Println("launching docker-dev stack...")
 	cmd := exec.Command(docker.Path("docker/launch.sh"), "docker-dev")
 	var err error
 
@@ -42,19 +41,20 @@ func TestMain(m *testing.M) {
 	retcode := m.Run()
 	fm.Close()
 
-	fmt.Println("stopping docker-compose stack...")
+	log.Println("stopping docker-compose stack...")
 	cmd.Process.Signal(syscall.SIGINT)
 	// note: even when we don't care about the output, it's best to consume it before calling cmd.Wait()
 	// even though the cmd.Wait docs say it will wait for stdout/stderr copying to complete
 	// however the docs for cmd.StdoutPipe say "it is incorrect to call Wait before all reads from the pipe have completed"
 	tracker.Wait()
-	if err := cmd.Wait(); err != nil {
-		// 130 means ctrl-C (interrupt) which is what we want
-		if err.Error() == "exit status 130" {
-			os.Exit(retcode)
-		}
+	err = cmd.Wait()
+
+	// 130 means ctrl-C (interrupt) which is what we want
+	if err != nil && err.Error() != "exit status 130" {
 		log.Printf("ERROR: could not cleanly shutdown running docker-compose command: %s", err)
 		retcode = 1
+	} else {
+		log.Println("docker-compose stack is shut down")
 	}
 
 	os.Exit(retcode)
@@ -68,8 +68,8 @@ func TestStartup(t *testing.T) {
 	}
 	select {
 	case <-tracker.Match(matchers):
-		fmt.Println("stack now running.")
-		fmt.Println("Go to http://localhost:3000 (and login as admin:admin) to see what's going on")
+		log.Println("stack now running.")
+		log.Println("Go to http://localhost:3000 (and login as admin:admin) to see what's going on")
 	case <-time.After(time.Second * 70):
 		grafana.PostAnnotation("TestStartup:FAIL")
 		t.Fatal("timed out while waiting for all metrictank instances to come up")