Merge lp:~mvo/snappy/snappy-fix-ftbfs-sbuild into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Fix FTBFS in a sbuild environment by mocking syslog tests and checking for /dev/shm.

Tiny branch that fixes a FTBFS in a sbuild environment. Skipping the logger tests is something I'm not happy with :/

[John Lenton (chipaca)]

I suspect you forgot something (inline).

review: Needs Fixing

[Michael Vogt (mvo)]

Thanks a lot! Insufficient tests, I'm sorry for that (I really should have learned this by now *sigh*). Fixed in r464 and added the missing test :)

[John Lenton (chipaca)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~mvo/snappy/snappy-fix-ftbfs-sbuild into lp:snappy failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update code.google.com/p/go.crypto failed; trying to fetch newer version
update github.com/blakesmith/ar failed; trying to fetch newer version
code.google.com/p/go.crypto now at 69e2a90ed92d03812364aeb947b7068dc42e561e
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 15347ef417a300349807983f15af9e65cd2e1b3a
update gopkg.in/yaml.v2 failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update launchpad.net/gocheck failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
launchpad.net/gocheck now at <email address hidden>
Building
Running tests from /home/tarmac/tmp/tmp.krhn3eL6z3/src/launchpad.net/snappy
=== RUN Test
OK: 16 passed
--- PASS: Test (0.24 seconds)
PASS
coverage: 80.2% of statements
ok launchpad.net/snappy/clickdeb 0.250s coverage: 80.2% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.05 seconds)
PASS
coverage: 12.2% of statements
ok launchpad.net/snappy/cmd/snappy 0.052s coverage: 12.2% of statements
=== RUN Test
OK: 24 passed
--- PASS: Test (0.08 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/coreconfig 0.081s coverage: 100.0% of statements
=== RUN Test
OK: 47 passed
--- PASS: Test (1.04 seconds)
PASS
coverage: 83.3% of statements
ok launchpad.net/snappy/helpers 1.052s coverage: 83.3% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 93.5% of statements
ok launchpad.net/snappy/logger 0.013s coverage: 93.5% of statements
=== RUN Test
OK: 36 passed
--- PASS: Test (0.15 seconds)
PASS
coverage: 81.5% of statements
ok launchpad.net/snappy/partition 0.150s coverage: 81.5% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/pkg 0.003s coverage: 100.0% of statements
=== RUN Test
OK: 12 passed
--- PASS: Test (0.07 seconds)
PASS
coverage: 94.3% of statements
ok launchpad.net/snappy/policy 0.069s coverage: 94.3% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 84.8% of statements
ok launchpad.net/snappy/priv 0.004s coverage: 84.8% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 50.0% of statements
ok launchpad.net/snappy/progress 0.010s coverage: 50.0% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/release 0.006s coverage: 100.0% of statements
=== RUN Test
drwxr-xr-x root/root 0 2015-05-20 03:11 ./bin
-rwxr-xr-x root/root 31 2015-05...

[Sergio Schvezov (sergiusens)]

I'll make this easy -> go vet says:
logger/logger_test.go:119:26: error strings should not end with punctuation

[lp:~mvo/snappy/snappy-fix-ftbfs-sbuild]

467. By Michael Vogt on 2015-05-22

merged lp:snappy

468. By Michael Vogt on 2015-05-22

logger/logger_test.go: fix go vet error

[Michael Vogt (mvo)]

review: Approve

=== modified file 'logger/logger.go'
--- logger/logger.go	2015-05-19 14:09:19 +0000
+++ logger/logger.go	2015-05-22 06:05:46 +0000
@@ -22,6 +22,7 @@
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"log/syslog"
 	"os"
@@ -114,16 +115,26 @@
 	l.log.Output(3, msg)
 }
 
+// variable to allow mocking the syslog.NewLogger call in the tests
+var newSyslog = newSyslogImpl
+
+func newSyslogImpl() (*log.Logger, error) {
+	return syslog.NewLogger(SyslogPriority, SyslogFlags)
+}
+
 // NewConsoleLog creates a ConsoleLog with a log.Logger using the given
 // io.Writer and flag, and a syslog.Writer.
 func NewConsoleLog(w io.Writer, flag int) (*ConsoleLog, error) {
-	sys, err := syslog.NewLogger(SyslogPriority, SyslogFlags)
+	clog := log.New(w, "", flag)
+
+	sys, err := newSyslog()
 	if err != nil {
-		return nil, err
+		clog.Output(3, "WARNING: can not create syslog logger")
+		sys = log.New(ioutil.Discard, "", flag)
 	}
 
 	return &ConsoleLog{
-		log: log.New(w, "", flag),
+		log: clog,
 		sys: sys,
 	}, nil
 }

=== modified file 'logger/logger_test.go'
--- logger/logger_test.go	2015-05-19 14:09:19 +0000
+++ logger/logger_test.go	2015-05-22 06:05:46 +0000
@@ -21,6 +21,7 @@
 
 import (
 	"bytes"
+	"fmt"
 	"log"
 	"testing"
 
@@ -32,14 +33,24 @@
 
 var _ = Suite(&LogSuite{})
 
-type LogSuite struct{}
+type LogSuite struct {
+	sysbuf *bytes.Buffer
+}
 
 func (s *LogSuite) SetUpTest(c *C) {
 	c.Assert(logger, Equals, NullLogger)
+
+	// we do not want to pollute syslog in our tests (and sbuild
+	// will also not let us do that)
+	newSyslog = func() (*log.Logger, error) {
+		s.sysbuf = bytes.NewBuffer(nil)
+		return log.New(s.sysbuf, "", SyslogFlags), nil
+	}
 }
 
 func (s *LogSuite) TearDownTest(c *C) {
 	SetLogger(NullLogger)
+	newSyslog = newSyslogImpl
 }
 
 func (s *LogSuite) TestDefault(c *C) {
@@ -65,42 +76,59 @@
 
 func (s *LogSuite) TestDebugf(c *C) {
 	var logbuf bytes.Buffer
-	var sysbuf bytes.Buffer
 	l, err := NewConsoleLog(&logbuf, DefaultFlags)
 	c.Assert(err, IsNil)
 
-	l.sys = log.New(&sysbuf, "", SyslogFlags)
 	SetLogger(l)
 
 	Debugf("xyzzy")
-	c.Check(sysbuf.String(), Matches, `(?m).*logger_test\.go:\d+: DEBUG: xyzzy`)
+	c.Check(s.sysbuf.String(), Matches, `(?m).*logger_test\.go:\d+: DEBUG: xyzzy`)
 	c.Check(logbuf.String(), Equals, "")
 }
 
 func (s *LogSuite) TestNoticef(c *C) {
 	var logbuf bytes.Buffer
-	var sysbuf bytes.Buffer
 	l, err := NewConsoleLog(&logbuf, DefaultFlags)
 	c.Assert(err, IsNil)
 
-	l.sys = log.New(&sysbuf, "", SyslogFlags)
 	SetLogger(l)
 
 	Noticef("xyzzy")
-	c.Check(sysbuf.String(), Matches, `(?m).*logger_test\.go:\d+: xyzzy`)
+	c.Check(s.sysbuf.String(), Matches, `(?m).*logger_test\.go:\d+: xyzzy`)
 	c.Check(logbuf.String(), Matches, `(?m).*logger_test\.go:\d+: xyzzy`)
 }
 
 func (s *LogSuite) TestPanicf(c *C) {
 	var logbuf bytes.Buffer
-	var sysbuf bytes.Buffer
 	l, err := NewConsoleLog(&logbuf, DefaultFlags)
 	c.Assert(err, IsNil)
 
-	l.sys = log.New(&sysbuf, "", SyslogFlags)
 	SetLogger(l)
 
 	c.Check(func() { Panicf("xyzzy") }, Panics, "xyzzy")
-	c.Check(sysbuf.String(), Matches, `(?m).*logger_test\.go:\d+: PANIC xyzzy`)
+	c.Check(s.sysbuf.String(), Matches, `(?m).*logger_test\.go:\d+: PANIC xyzzy`)
 	c.Check(logbuf.String(), Matches, `(?m).*logger_test\.go:\d+: PANIC xyzzy`)
 }
+
+func (s *LogSuite) TestSyslogFails(c *C) {
+	var logbuf bytes.Buffer
+
+	// pretend syslog is not available (e.g. because of no /dev/log in
+	// a chroot or something)
+	newSyslog = func() (*log.Logger, error) {
+		return nil, fmt.Errorf("nih nih")
+	}
+
+	// ensure a warning is displayed
+	l, err := NewConsoleLog(&logbuf, DefaultFlags)
+	c.Assert(err, IsNil)
+	c.Check(logbuf.String(), Matches, `(?m).*:\d+: WARNING: can not create syslog logger`)
+
+	// ensure that even without a syslog the console log works and we
+	// do not crash
+	logbuf.Reset()
+	SetLogger(l)
+	Noticef("I do not want to crash")
+	c.Check(logbuf.String(), Matches, `(?m).*logger_test\.go:\d+: I do not want to crash`)
+
+}

=== modified file 'snappy/build_test.go'
--- snappy/build_test.go	2015-05-19 19:34:13 +0000
+++ snappy/build_test.go	2015-05-22 06:05:46 +0000
@@ -325,9 +325,16 @@
 
 func (s *SnapTestSuite) TestCopyActuallyCopies(c *C) {
 	sourceDir := makeExampleSnapSourceDir(c, "name: hello")
-	// hoping to get the non-linking behaviour
+
+	// hoping to get the non-linking behaviour via /dev/shm
 	target, err := ioutil.TempDir("/dev/shm", "copy")
+	// sbuild environments won't allow writing to /dev/shm, so its
+	// ok to skip there
+	if os.IsPermission(err) {
+		c.Skip("/dev/shm is not writable for us")
+	}
 	c.Assert(err, IsNil)
+
 	defer os.Remove(target)
 	c.Assert(copyToBuildDir(sourceDir, target), IsNil)
 	out, err := exec.Command("diff", "-qrN", sourceDir, target).Output()