Merge lp:~fgimenez/snappy/integration-tests-verbosity-flag into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

Integration tests verbosity flag

Integration tests verbosity flag.

There are currently only two levels implemented, DebugLevel (the default) and InfoLevel. The level can be set with:

  tlog.SetLevel(tlog.InfoLevel)

There are functions for logging at each level, tlog.Debugf and tlog.Infof. Currently all the previous fmt.Print have been changed into tlog.Debugf, which makes that, being DebugLevel the default, without flags the test run logs the same output as before. To get a less verbose output:

  $ go run _integration-tests/main.go -loglevel info

There are currently no messages sent with tlog.Infof, the previous command only logs gocheck and adt-run related output.

[Leo Arias (elopio)]

Thanks for working on this.

I'm wondering if we should use log.Print instead of fmt.Fprint. I've never done logging in go before, so I think it would be nice to get a review from mvo, sergio or chipaca. Can you please ask one of them tomorrow to take a quick look?

review: Needs Information

[Michael Vogt (mvo)]

Thanks for this branch! Its a bit unfortunate IMO that the native go logger is so limited, no support for log levels is really limiting and means that everyone has to reimplement a logger:/

We have a logger in snappy/logger already, I wonder if we could reuse that here instead of having a additional one? The one we have is a little more limited right now, i.e. you can suppress log messages right now, but it looks like it would be worthwhile to add there instead of having two versions. What do you think? Or is there something in the tests that makes sharing the logger unsuitable?

[Federico Gimenez (fgimenez)]

@Michael I totally agree, it would be nice if we could use a single logger.

I had a look at the logger package before beginning with this and it seemed to me that it was oriented to a cli tool, with two "channels" to output messages but without giving the user the option to decide which kind of messages to show. In the case of the test logger there should be just one way of output (it shouldn't use syslog), but with different levels, and the level to be used should be selectable at invocation time. If we can make both things work at once it would be great :)

When we'll execute the tests on CI, for instance, we would like always the more verbose output on stdout, while perhaps a developer executing the suite locally would prefer to have a less verbose output, and enable the verbose one if there's an error.

Leo, what do you think?

Unmerged revisions

746. By Federico Gimenez on 2015-10-07

boot log also affected by the flag

745. By Federico Gimenez on 2015-10-07

set level in testbed moved to base_test's init

744. By Federico Gimenez on 2015-10-07

loglevel flag; passing the loglevel to the testbedd in config

743. By Federico Gimenez on 2015-10-07

removed calls to fmt.Print; added new line

742. By Federico Gimenez on 2015-10-07

tlog package

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-09-02 03:12:43 +0000
+++ _integration-tests/main.go	2015-10-07 15:29:59 +0000
@@ -31,6 +31,7 @@
 	"launchpad.net/snappy/_integration-tests/testutils/build"
 	"launchpad.net/snappy/_integration-tests/testutils/config"
 	"launchpad.net/snappy/_integration-tests/testutils/image"
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 const (
@@ -39,6 +40,7 @@
 	defaultChannel   = "edge"
 	defaultSSHPort   = 22
 	dataOutputDir    = "_integration-tests/data/output/"
+	defaultLogLevel  = "debug"
 )
 
 var configFileName = filepath.Join(dataOutputDir, "testconfig.json")
@@ -70,10 +72,15 @@
 		rollback = flag.Bool("rollback", false,
 			"If this flag is used, the image will be updated and then rolled back before running the tests.")
 		outputDir = flag.String("output-dir", defaultOutputDir, "Directory where test artifacts will be stored.")
+		logLevel  = flag.String("loglevel", defaultLogLevel, "Log verbosity level, info or debug.")
 	)
 
 	flag.Parse()
 
+	if err := tlog.SetTextLevel(*logLevel); err != nil {
+		log.Panic(err.Error())
+	}
+
 	build.Assets(*useSnappyFromBranch, *arch)
 
 	// TODO: generate the files out of the source tree. --elopio - 2015-07-15
@@ -85,7 +92,7 @@
 	// TODO: pass the config as arguments to the test binaries.
 	// --elopio - 2015-07-15
 	cfg := config.NewConfig(
-		configFileName, *imgRelease, *imgChannel, *targetRelease, *targetChannel,
+		configFileName, *imgRelease, *imgChannel, *targetRelease, *targetChannel, *logLevel,
 		remoteTestbed, *update, *rollback)
 	cfg.Write()
 
 
=== modified file '_integration-tests/tests/base_test.go'
--- _integration-tests/tests/base_test.go	2015-09-03 11:35:59 +0000
+++ _integration-tests/tests/base_test.go	2015-10-07 15:29:59 +0000
@@ -21,13 +21,29 @@
 
 import (
 	"io"
+	"log"
 	"os"
 	"testing"
 
+	"launchpad.net/snappy/_integration-tests/testutils/config"
 	"launchpad.net/snappy/_integration-tests/testutils/report"
 	"launchpad.net/snappy/_integration-tests/testutils/runner"
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
+func init() {
+	cfg, err := config.ReadConfig(
+		"_integration-tests/data/output/testconfig.json")
+
+	if err != nil {
+		log.Panic(err.Error())
+	}
+
+	if err = tlog.SetTextLevel(cfg.LogLevel); err != nil {
+		log.Panic(err.Error())
+	}
+}
+
 // Hook up gocheck into the "go test" runner.
 func Test(t *testing.T) {
 	output := io.MultiWriter(
 
=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest.go'
--- _integration-tests/testutils/autopkgtest/autopkgtest.go	2015-08-24 17:43:59 +0000
+++ _integration-tests/testutils/autopkgtest/autopkgtest.go	2015-10-07 15:29:59 +0000
@@ -20,11 +20,11 @@
 package autopkgtest
 
 import (
-	"fmt"
 	"path/filepath"
 	"strings"
 
 	"launchpad.net/snappy/_integration-tests/testutils"
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 	"launchpad.net/snappy/_integration-tests/testutils/tpl"
 )
 
@@ -75,7 +75,7 @@
 		return
 	}
 
-	fmt.Println("Calling adt-run...")
+	tlog.Debugf("Calling adt-run...")
 	outputDir := filepath.Join(a.testArtifactsPath, "output")
 	prepareTargetDir(outputDir)
 
 
=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest_test.go'
--- _integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-09-30 04:39:25 +0000
+++ _integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-10-07 15:29:59 +0000
@@ -29,6 +29,8 @@
 	"testing"
 
 	"gopkg.in/check.v1"
+
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 // Hook up check.v1 into the "go test" runner
@@ -183,6 +185,22 @@
 	c.Assert(err, check.NotNil, check.Commentf("Expected error from tpl not received!"))
 }
 
+func (s *AutopkgtestSuite) TestAdtRunLocalHonoursLogLevel(c *check.C) {
+	backTlogGetLevel := tlogGetLevel
+	defer func() { tlogGetLevel = backTlogGetLevel }()
+	tlogGetLevel = func() tlog.Level {
+		return tlog.InfoLevel
+	}
+	s.subject.AdtRunLocal(imgPath)
+
+	outputDir := outputDir(testArtifactsPath)
+	expectedExecCommadCall := adtrunLocalCmd(controlFile, sourceCodePath, outputDir, imgPath)
+
+	c.Assert(s.execCalls[expectedExecCommadCall],
+		check.Equals, 1,
+		check.Commentf("Expected call %s not executed 1 time", expectedExecCommadCall))
+}
+
 func tplExecuteCmd(tplFile, outputFile string, data interface{}) string {
 	return fmt.Sprint(tplFile, outputFile, data)
 }
@@ -192,7 +210,14 @@
 }
 
 func adtrunLocalCmd(controlFile, sourceCodePath, outputDir, imgPath string) string {
-	options := fmt.Sprintf("--- ssh -s /usr/share/autopkgtest/ssh-setup/snappy -- -b -i %s", imgPath)
+	var showBoot string
+
+	if tlogGetLevel() == tlog.DebugLevel {
+		showBoot = " -b"
+	}
+
+	options := fmt.Sprintf("--- ssh -s /usr/share/autopkgtest/ssh-setup/snappy --%s -i %s",
+		showBoot, imgPath)
 	return adtrunCommonCmd(controlFile, sourceCodePath, outputDir, options)
 }
 
 
=== modified file '_integration-tests/testutils/autopkgtest/ssh.go'
--- _integration-tests/testutils/autopkgtest/ssh.go	2015-09-30 04:39:25 +0000
+++ _integration-tests/testutils/autopkgtest/ssh.go	2015-10-07 15:29:59 +0000
@@ -24,6 +24,8 @@
 	"os"
 	"path/filepath"
 	"strconv"
+
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 const (
@@ -31,9 +33,19 @@
 	sshTimeout       = 600
 )
 
+var (
+	// dependency aliasing
+	tlogGetLevel = tlog.GetLevel
+)
+
 func kvmSSHOptions(imagePath string) string {
-	return fmt.Sprint(commonSSHOptions,
-		"-s /usr/share/autopkgtest/ssh-setup/snappy -- -b -i ", imagePath)
+	var showBoot string
+
+	if tlogGetLevel() == tlog.DebugLevel {
+		showBoot = " -b"
+	}
+	return fmt.Sprintf(commonSSHOptions+
+		"-s /usr/share/autopkgtest/ssh-setup/snappy --%s -i "+imagePath, showBoot)
 }
 
 func remoteTestbedSSHOptions(testbedIP string, testbedPort int) string {
 
=== modified file '_integration-tests/testutils/build/build.go'
--- _integration-tests/testutils/build/build.go	2015-09-14 09:38:49 +0000
+++ _integration-tests/testutils/build/build.go	2015-10-07 15:29:59 +0000
@@ -20,12 +20,12 @@
 package build
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"launchpad.net/snappy/_integration-tests/testutils"
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 const (
@@ -71,17 +71,17 @@
 }
 
 func buildSnappyCLI(arch string) {
-	fmt.Println("Building snappy CLI...")
+	tlog.Debugf("Building snappy CLI...")
 	goCall(arch, buildSnappyCliCmd)
 }
 
 func buildSnapd(arch string) {
-	fmt.Println("Building snapd...")
+	tlog.Debugf("Building snapd...")
 	goCall(arch, buildSnapdCmd)
 }
 
 func buildTests(arch string) {
-	fmt.Println("Building tests...")
+	tlog.Debugf("Building tests...")
 
 	goCall(arch, buildTestCmd)
 	// XXX Go test 1.3 does not have the output flag, so we move the
 
=== modified file '_integration-tests/testutils/build/build_test.go'
--- _integration-tests/testutils/build/build_test.go	2015-09-09 13:12:16 +0000
+++ _integration-tests/testutils/build/build_test.go	2015-10-07 15:29:59 +0000
@@ -127,7 +127,6 @@
 
 	buildCall := s.execCalls[buildTestCmd]
 
-	fmt.Println(s.execCalls)
 	c.Assert(buildCall, check.Equals, 1,
 		check.Commentf("Expected 1 call to execCommand with %s, got %d",
 			buildTestCmd, buildCall))
 
=== modified file '_integration-tests/testutils/cli/cli.go'
--- _integration-tests/testutils/cli/cli.go	2015-10-02 12:02:16 +0000
+++ _integration-tests/testutils/cli/cli.go	2015-10-07 15:29:59 +0000
@@ -20,12 +20,13 @@
 package cli
 
 import (
-	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 
 	"gopkg.in/check.v1"
+
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 var execCommand = exec.Command
@@ -55,10 +56,10 @@
 // ExecCommandErr executes a shell command and returns a string with the output
 // of the command and eventually the obtained error
 func ExecCommandErr(cmds ...string) (output string, err error) {
-	fmt.Println(strings.Join(cmds, " "))
+	tlog.Debugf(strings.Join(cmds, " "))
 	cmd := execCommand(cmds[0], cmds[1:]...)
 	outputByte, err := cmd.CombinedOutput()
 	output = string(outputByte)
-	fmt.Print(output)
+	tlog.Debugf(output)
 	return
 }
 
=== modified file '_integration-tests/testutils/common/common.go'
--- _integration-tests/testutils/common/common.go	2015-10-01 09:37:04 +0000
+++ _integration-tests/testutils/common/common.go	2015-10-07 15:29:59 +0000
@@ -33,6 +33,7 @@
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/config"
 	"launchpad.net/snappy/_integration-tests/testutils/partition"
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 const (
@@ -102,11 +103,11 @@
 			c.TestName(), contents))
 	} else {
 		if CheckRebootMark("") {
-			c.Logf("****** Running %s", c.TestName())
+			tlog.Debugf("****** Running %s", c.TestName())
 			SetSavedVersion(c, GetCurrentUbuntuCoreVersion(c))
 		} else {
 			if AfterReboot(c) {
-				c.Logf("****** Resuming %s after reboot", c.TestName())
+				tlog.Debugf("****** Resuming %s after reboot", c.TestName())
 			} else {
 				c.Skip(fmt.Sprintf("****** Skipped %s after reboot caused by %s",
 					c.TestName(), os.Getenv("ADT_REBOOT_MARK")))
@@ -131,7 +132,7 @@
 				partition.MakeWritable(c, target)
 				defer partition.MakeReadonly(c, target)
 				original := filepath.Join(target, channelCfgFile)
-				c.Logf("Restoring %s...", original)
+				tlog.Debugf("Restoring %s...", original)
 				cli.ExecCommand(c, "sudo", "mv", backup, original)
 			}
 		}
@@ -162,7 +163,7 @@
 }
 
 func replaceSystemImageValues(c *check.C, file, release, channel, version string) {
-	c.Log("Switching the system image conf...")
+	tlog.Debugf("Switching the system image conf...")
 	replaceRegex := map[string]string{
 		release: `s#channel: ubuntu-core/.*/\(.*\)#channel: ubuntu-core/%s/\1#`,
 		channel: `s#channel: ubuntu-core/\(.*\)/.*#channel: ubuntu-core/\1/%s#`,
@@ -210,13 +211,13 @@
 
 // CallFakeUpdate calls snappy update after faking the current version
 func CallFakeUpdate(c *check.C) string {
-	c.Log("Preparing fake and calling update.")
+	tlog.Debugf("Preparing fake and calling update.")
 	fakeAvailableUpdate(c)
 	return cli.ExecCommand(c, "sudo", "snappy", "update")
 }
 
 func fakeAvailableUpdate(c *check.C) {
-	c.Log("Faking an available update...")
+	tlog.Debugf("Faking an available update...")
 	currentVersion := GetCurrentUbuntuCoreVersion(c)
 	switchChannelVersionWithBackup(c, currentVersion-1)
 	SetSavedVersion(c, currentVersion-1)
@@ -245,7 +246,7 @@
 
 // RebootWithMark requests a reboot using a specified mark.
 func RebootWithMark(c *check.C, mark string) {
-	c.Log("Preparing reboot with mark " + mark)
+	tlog.Debugf("Preparing reboot with mark " + mark)
 	err := ioutil.WriteFile(needsRebootFile, []byte(mark), 0777)
 	c.Assert(err, check.IsNil, check.Commentf("Error writing needs-reboot file: %v", err))
 }
 
=== modified file '_integration-tests/testutils/config/config.go'
--- _integration-tests/testutils/config/config.go	2015-07-31 07:55:33 +0000
+++ _integration-tests/testutils/config/config.go	2015-10-07 15:29:59 +0000
@@ -21,9 +21,10 @@
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"log"
+
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 // Config contains the values to pass to the test bed from the host.
@@ -33,24 +34,25 @@
 	Channel       string
 	TargetRelease string
 	TargetChannel string
+	LogLevel      string
 	RemoteTestbed bool
 	Update        bool
 	Rollback      bool
 }
 
 // NewConfig is the Config constructor
-func NewConfig(fileName, release, channel, targetRelease, targetChannel string, remoteTestbed, update, rollback bool) *Config {
+func NewConfig(fileName, release, channel, targetRelease, targetChannel, logLevel string, remoteTestbed, update, rollback bool) *Config {
 	return &Config{
 		FileName: fileName, Release: release, Channel: channel,
-		TargetRelease: targetRelease, TargetChannel: targetChannel,
+		TargetRelease: targetRelease, TargetChannel: targetChannel, LogLevel: logLevel,
 		RemoteTestbed: remoteTestbed, Update: update, Rollback: rollback,
 	}
 }
 
 // Write writes the config to a file that will be copied to the test bed.
 func (cfg Config) Write() {
-	fmt.Println("Writing test config...")
-	fmt.Println(cfg)
+	tlog.Debugf("Writing test config...")
+	tlog.Debugf("Config: %v", cfg)
 	encoded, err := json.Marshal(cfg)
 	if err != nil {
 		log.Panicf("Error encoding the test config: %v", err)
 
=== modified file '_integration-tests/testutils/config/config_test.go'
--- _integration-tests/testutils/config/config_test.go	2015-07-31 07:55:33 +0000
+++ _integration-tests/testutils/config/config_test.go	2015-10-07 15:29:59 +0000
@@ -26,7 +26,7 @@
 	"path/filepath"
 	"testing"
 
-	check "gopkg.in/check.v1"
+	"gopkg.in/check.v1"
 )
 
 // Hook up check.v1 into the "go test" runner
@@ -46,7 +46,7 @@
 func testConfigStruct(fileName string) *Config {
 	return NewConfig(
 		fileName,
-		"testrelease", "testchannel", "testtargetrelease", "testtargetchannel",
+		"testrelease", "testchannel", "testtargetrelease", "testtargetchannel", "info",
 		true, true, true)
 }
 func testConfigContents(fileName string) string {
@@ -56,6 +56,7 @@
 		`"Channel":"testchannel",` +
 		`"TargetRelease":"testtargetrelease",` +
 		`"TargetChannel":"testtargetchannel",` +
+		`"LogLevel":"info",` +
 		`"RemoteTestbed":true,` +
 		`"Update":true,` +
 		`"Rollback":true` +
@@ -102,6 +103,7 @@
 		`"Channel":"testchannel",` +
 		`"TargetRelease":"testtargetrelease",` +
 		`"TargetChannel":"testtargetchannel",` +
+		`"LogLevel":"info",` +
 		`"RemoteTestbed":false,` +
 		`"Update":true,` +
 		`"Rollback":true` +
@@ -113,7 +115,7 @@
 
 	testConfigStruct := NewConfig(
 		configFileName,
-		"testrelease", "testchannel", "testtargetrelease", "testtargetchannel",
+		"testrelease", "testchannel", "testtargetrelease", "testtargetchannel", "info",
 		false, true, true)
 
 	c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))
 
=== modified file '_integration-tests/testutils/image/image.go'
--- _integration-tests/testutils/image/image.go	2015-09-15 09:33:22 +0000
+++ _integration-tests/testutils/image/image.go	2015-10-07 15:29:59 +0000
@@ -20,11 +20,11 @@
 package image
 
 import (
-	"fmt"
 	"path/filepath"
 	"strings"
 
 	"launchpad.net/snappy/_integration-tests/testutils"
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 // Image type encapsulates image actions
@@ -42,7 +42,7 @@
 
 // UdfCreate forms and executes the UDF command for creating the image
 func (img Image) UdfCreate() (string, error) {
-	fmt.Println("Creating image...")
+	tlog.Debugf("Creating image...")
 
 	imageDir := filepath.Join(img.baseDir, "image")
 
 
=== modified file '_integration-tests/testutils/partition/partition.go'
--- _integration-tests/testutils/partition/partition.go	2015-10-02 12:02:16 +0000
+++ _integration-tests/testutils/partition/partition.go	2015-10-07 15:29:59 +0000
@@ -21,7 +21,6 @@
 
 import (
 	"bufio"
-	"fmt"
 	"regexp"
 	"strings"
 
@@ -80,7 +79,6 @@
 		for scanner.Scan() {
 			fields := strings.Fields(scanner.Text())
 			if match, _ := regexp.MatchString("^[0-9]+w$", fields[3]); match {
-				fmt.Printf("match! %s", fields[3])
 				return fields[3], nil
 			}
 		}
 
=== modified file '_integration-tests/testutils/testutils.go'
--- _integration-tests/testutils/testutils.go	2015-07-28 12:45:05 +0000
+++ _integration-tests/testutils/testutils.go	2015-10-07 15:29:59 +0000
@@ -20,11 +20,12 @@
 package testutils
 
 import (
-	"fmt"
 	"log"
 	"os"
 	"os/exec"
 	"strings"
+
+	"launchpad.net/snappy/_integration-tests/testutils/tlog"
 )
 
 // PrepareTargetDir creates the given target directory, removing it previously if it didn't exist
@@ -47,7 +48,7 @@
 
 // ExecCommand executes the given command and pipes the results to os.Stdout and os.Stderr, returning the resulting error
 func ExecCommand(cmds ...string) error {
-	fmt.Println(strings.Join(cmds, " "))
+	tlog.Debugf(strings.Join(cmds, " "))
 
 	cmd := exec.Command(cmds[0], cmds[1:]...)
 	cmd.Stdout = os.Stdout
 
=== added directory '_integration-tests/testutils/tlog'
=== added file '_integration-tests/testutils/tlog/tlog.go'
--- _integration-tests/testutils/tlog/tlog.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/tlog/tlog.go	2015-10-07 15:29:59 +0000
@@ -0,0 +1,101 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package tlog
+
+import (
+	"fmt"
+	"io"
+	"os"
+)
+
+// Level represents the logging level
+type Level uint8
+
+// ErrLogLevel is returned when a not recognized textual log level is passed
+// to SetTextLevel
+type ErrLogLevel struct {
+	s string
+}
+
+func (e *ErrLogLevel) Error() string {
+	return fmt.Sprintf("The level %s is not supported", e.s)
+}
+
+const (
+	// InfoLevel is the less verbose mode
+	InfoLevel Level = iota
+	// DebugLevel is the most verbose mode
+	DebugLevel
+)
+
+// Logger is the type of the internal instance holding the state
+type Logger struct {
+	output io.Writer // the output goes through this writer
+	level  Level     // log level, functions with a level below this won't write to output
+}
+
+// this variable carries the underlaying state of the logger
+var l = &Logger{output: os.Stdout, level: DebugLevel}
+
+// GetOutput is the getter for the output writter
+func GetOutput() io.Writer {
+	return l.output
+}
+
+// SetOutput is the setter for the output writter
+func SetOutput(w io.Writer) {
+	l.output = w
+}
+
+// GetLevel is the getter for the log level
+func GetLevel() Level {
+	return l.level
+}
+
+// SetLevel is the getter for the log level
+func SetLevel(lvl Level) {
+	l.level = lvl
+}
+
+// SetTextLevel is the getter for the log level
+func SetTextLevel(s string) (err error) {
+	switch s {
+	case "info":
+		SetLevel(InfoLevel)
+		return
+	case "debug":
+		SetLevel(DebugLevel)
+		return
+	default:
+		return &ErrLogLevel{s}
+	}
+}
+
+// Debugf outputs debug messages
+func Debugf(format string, args ...interface{}) {
+	if l.level >= DebugLevel {
+		fmt.Fprintf(l.output, format+"\n", args...)
+	}
+}
+
+// Infof outputs info messages
+func Infof(format string, args ...interface{}) {
+	fmt.Fprintf(l.output, format+"\n", args...)
+}
 
=== added file '_integration-tests/testutils/tlog/tlog_test.go'
--- _integration-tests/testutils/tlog/tlog_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/tlog/tlog_test.go	2015-10-07 15:29:59 +0000
@@ -0,0 +1,145 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package tlog
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"testing"
+
+	"gopkg.in/check.v1"
+)
+
+// Hook up check.v1 into the "go test" runner
+func Test(t *testing.T) { check.TestingT(t) }
+
+// Different suite so that we don't initialize fields
+// of the subject and can do assertions on the default
+// values
+type logTestDefaultValuesSuite struct {
+}
+
+var _ = check.Suite(&logTestDefaultValuesSuite{})
+
+func (s *logTestDefaultValuesSuite) TestDefaultOutput(c *check.C) {
+	output := GetOutput()
+
+	c.Assert(output, check.Equals, os.Stdout)
+}
+
+func (s *logTestDefaultValuesSuite) TestDefaultLevel(c *check.C) {
+	level := GetLevel()
+
+	c.Assert(level, check.Equals, DebugLevel)
+}
+
+type logTestSuite struct {
+	output bytes.Buffer
+}
+
+var _ = check.Suite(&logTestSuite{})
+
+func (s *logTestSuite) SetUpSuite(c *check.C) {
+	SetOutput(&s.output)
+}
+
+func (s *logTestSuite) SetUpTest(c *check.C) {
+	s.output.Reset()
+	SetLevel(DebugLevel)
+}
+
+func (s *logTestSuite) TestLogWritesDebugOutput(c *check.C) {
+	msg := "this is a debug message"
+	Debugf(msg)
+
+	c.Assert(s.output.String(), check.Equals, msg+"\n")
+}
+
+func (s *logTestSuite) TestLogDoesNotWritesDebugOutputWhenLevelIsInfo(c *check.C) {
+	msg := "this is a debug message"
+
+	SetLevel(InfoLevel)
+	Debugf(msg)
+
+	c.Assert(s.output.String(), check.Equals, "")
+}
+
+func (s *logTestSuite) TestLogWritesDebugOutputWithFormat(c *check.C) {
+	msg := "this is a debug message with %d %s"
+	par1 := 2
+	par2 := "parameters"
+	expected := "this is a debug message with 2 parameters\n"
+
+	Debugf(msg, par1, par2)
+
+	c.Assert(s.output.String(), check.Equals, expected)
+}
+
+func (s *logTestSuite) TestLogWritesInfoOutput(c *check.C) {
+	msg := "this is a info message"
+	Infof(msg)
+
+	c.Assert(s.output.String(), check.Equals, msg+"\n")
+}
+
+func (s *logTestSuite) TestLogWritesInfoOutputWithFormat(c *check.C) {
+	msg := "this is a info message with %d %s"
+	par1 := 2
+	par2 := "parameters"
+	expected := "this is a info message with 2 parameters\n"
+
+	Infof(msg, par1, par2)
+
+	c.Assert(s.output.String(), check.Equals, expected)
+}
+
+func (s *logTestSuite) TestSetTextLevel(c *check.C) {
+	currentLvl := GetLevel()
+	defer SetLevel(currentLvl)
+	testCases := []struct {
+		textLvl string
+		level   Level
+	}{{"info", InfoLevel},
+		{"debug", DebugLevel},
+	}
+	for _, testCase := range testCases {
+		err := SetTextLevel(testCase.textLvl)
+		lvl := GetLevel()
+
+		c.Check(err, check.IsNil)
+		c.Check(lvl, check.Equals, testCase.level)
+	}
+}
+
+func (s *logTestSuite) TestSetWrongTextLevel(c *check.C) {
+	currentLvl := GetLevel()
+	defer SetLevel(currentLvl)
+
+	wrongLvl := "not-supported-level"
+
+	err := SetTextLevel(wrongLvl)
+	lvl := GetLevel()
+
+	c.Assert(err.Error(), check.Equals,
+		fmt.Sprintf("The level %s is not supported", wrongLvl))
+
+	c.Assert(lvl, check.Equals, currentLvl)
+}