Cleanup logs

Author: asnowfix

guestprop.go

@@ -36,7 +36,6 @@ func GetGuestProperty(vm string, prop string) (string, error) {
 	}
 	out, err = Manage.runOut("guestproperty", "get", vm, prop)
 	if err != nil {
-		log.Print(err)
 		return "", err
 	}
 	out = strings.TrimSpace(out)

guestprop_test.go

@@ -21,7 +21,7 @@ func TestGuestProperty(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	Debug("OK SetGuestProperty test_key=test_val")
+	t.Logf("OK SetGuestProperty test_key=test_val")
 
 	if ManageMock != nil {
 		ManageMock.EXPECT().isGuest().Return(false)
@@ -129,24 +129,24 @@ func TestWaitGuestProperties(t *testing.T) {
 	}
 
 	props := "test_*"
-	fmt.Printf("TestWaitGuestProperties(): will wait on '%s' for %d changes\n", props, left)
+	t.Logf("TestWaitGuestProperties(): will wait on '%s' for %d changes\n", props, left)
 	propsC, doneC, wg := WaitGetProperties(VM, props)
 
-	fmt.Printf("TestWaitGuestProperties(): waiting on: %T(%v)\n", propsC, propsC)
+	t.Logf("TestWaitGuestProperties(): waiting on: %T(%v)\n", propsC, propsC)
 	// for prop := range propsChan {
 	ok := true
 	for ; ok && left > 0; left-- {
 		var prop GuestProperty
-		fmt.Printf("TestWaitGuestProperties(): unstacking... (left=%d)\n", left)
+		t.Logf("TestWaitGuestProperties(): unstacking... (left=%d)\n", left)
 		prop, ok = <-propsC
-		fmt.Printf("TestWaitGuestProperties(): unstacked: %+v (left=%d)\n", prop, left)
+		t.Logf("TestWaitGuestProperties(): unstacked: %+v (left=%d)\n", prop, left)
 	}
-	fmt.Printf("TestWaitGuestProperties(): done...\n")
+	t.Logf("TestWaitGuestProperties(): done...\n")
 	doneC <- true
-	fmt.Printf("TestWaitGuestProperties(): done... Ok\n")
+	t.Logf("TestWaitGuestProperties(): done... Ok\n")
 
 	wg.Wait()
-	fmt.Printf("TestWaitGuestProperties(): exiting\n")
+	t.Logf("TestWaitGuestProperties(): exiting\n")
 
 	Teardown()
 }

log_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"testing"
 )
 
 var logger = log.New(os.Stderr, "", 0)
@@ -15,6 +16,9 @@ func logLn(msg string) {
 }
 
 func logF(format string, args ...interface{}) {
+	if !testing.Verbose() {
+		return
+	}
 	logLn(fmt.Sprintf(format, args...))
 }
 
@@ -25,4 +29,5 @@ func init() {
 	// }
 	Debug = logF
 	Debug("Using Verbose Log")
+	Debug("testing.Verbose=%v", testing.Verbose())
 }

regexp_test.go

@@ -1,7 +1,6 @@
 package virtualbox
 
 import (
-	"log"
 	"os"
 	"regexp"
 	"testing"
@@ -20,7 +19,7 @@ func TestGetRegexp(t *testing.T) {
 		re = regexp.MustCompile(reStr)
 	}
 	var match = re.FindStringSubmatch(str)
-	log.Print("match:", match)
+	t.Log("match:", match)
 	if len(match) != 2 {
 		t.Fatal("No match")
 	}

vbcmd.go

@@ -3,7 +3,6 @@ package virtualbox
 import (
 	"bytes"
 	"errors"
-	"log"
 	"os"
 	"os/exec"
 	"os/user"
@@ -46,10 +45,12 @@ func isSudoer() (bool, error) {
 	if err != nil {
 		return false, err
 	}
+	Debug("User: '%+v'", me)
 	if groupIDs, err := me.GroupIds(); runtime.GOOS == "linux" {
 		if err != nil {
 			return false, err
 		}
+		Debug("groupIDs: '%+v'", groupIDs)
 		for _, groupID := range groupIDs {
 			if groupID == "sudo" {
 				return true, nil
@@ -85,6 +86,7 @@ func (vbcmd command) path() string {
 func (vbcmd command) prepare(args []string) *exec.Cmd {
 	program := vbcmd.program
 	argv := []string{}
+	Debug("Command: '%+v', runtime.GOOS: '%s'", vbcmd, runtime.GOOS)
 	if vbcmd.sudoer && vbcmd.sudo && runtime.GOOS != "windows" {
 		program = "sudo"
 		argv = append(argv, vbcmd.program)

vbmgt_test.go

@@ -34,7 +34,7 @@ func Setup(t *testing.T) {
 	} else {
 		t.Logf("Using real VM='%s'\n", VM)
 	}
-	t.Logf("Using Manage='%T', path='%v'", Manage, Manage.path())
+	t.Logf("Using Manage='%+v' (type: '%T')", Manage, Manage)
 }
 
 func Teardown() {