Merge lp:~chipaca/snappy/skip-homedir-no-schroot into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

* skip the "homedir is still found when HOME is empty" test when the original HOME env indicates you're in a schroot, as the fallback system call will give the wrong (but correct) result.
* silence the logs when testing a panic in cmd, to avoid scaremongering.

[Michael Vogt (mvo)]

Nice!

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~chipaca/snappy/skip-homedir-no-schroot into lp:snappy failed. Below is the output from the failed tests.

Checking docs
Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/cheggaaa/pb failed; trying to fetch newer version
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update golang.org/x/crypto failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 361f6ebcbb54f389d15dc9faefa000e996ba3e37
update github.com/gorilla/mux failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update github.com/gosexy/gettext failed; trying to fetch newer version
github.com/gorilla/mux now at ee1815431e497d3850809578c93ab6705f1a19f7
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update github.com/peterh/liner failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update code.google.com/p/go.crypto failed; trying to fetch newer version
github.com/peterh/liner now at 1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced
update github.com/blakesmith/ar failed; trying to fetch newer version
code.google.com/p/go.crypto now at 69e2a90ed92d03812364aeb947b7068dc42e561e
update github.com/coreos/go-systemd failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/coreos/go-systemd now at f743bc15d6bddd23662280b4ad20f7c874cdd5ad
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/gorilla/context now at 1c83b3eabd45b6d76072b66b746c20815fb2872d
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update gopkg.in/tomb.v2 failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
gopkg.in/tomb.v2 now at 14b3d72120e8d10ea6e6b7f87f7175734b1faab8
Building
Running tests from /tmp/tmp.7RgcF4oWrl/src/launchpad.net/snappy
? launchpad.net/snappy/cmd/snapd [no test files]
=== RUN Test
OK: 12 passed
--- PASS: Test (0.03 seconds)
PASS
coverage: 21.2% of statements
ok launchpad.net/snappy/cmd/snappy 0.049s coverage: 21.2% of statements
=== RUN Test
OK: 41 passed
--- PASS: Test (0.16 seconds)
PASS
coverage: 89.7% of statements
ok launchpad.net/snappy/coreconfig 0.166s coverage: 89.7% of statements
=== RUN Test
OK: 39 passed
--- PASS: Test (0.18 seconds)
PASS
coverage: 69.8% of statements
ok launchpad.net/snappy/daemon 0.190s coverage: 69.8% of statements
? launchpad.net/snappy/dirs [no test files]
=== RUN Test
OK: 59 passed
--- PASS: Test (0.32 seconds)
PASS
coverage: 78.9% of statements
ok launchpad.net/snappy/helpers 0.324s coverage: 78.9% of statements
=== RUN Test
OK: 0 passed, 2 sk...

[lp:~chipaca/snappy/skip-homedir-no-schroot]

778. By John Lenton on 2015-10-19

make golint happy again

[Michael Vogt (mvo)]

review: Approve

=== modified file 'cmd/snappy/common_test.go'
--- cmd/snappy/common_test.go	2015-07-09 06:05:53 +0000
+++ cmd/snappy/common_test.go	2015-10-19 12:02:38 +0000
@@ -23,8 +23,9 @@
 	"testing"
 
 	"github.com/jessevdk/go-flags"
-
 	. "gopkg.in/check.v1"
+
+	"launchpad.net/snappy/logger"
 )
 
 // Hook up check.v1 into the "go test" runner
@@ -66,6 +67,10 @@
 }
 
 func (s *CmdTestSuite) TestAddOptionDescriptionOrPanicWillPanic(c *C) {
+	// disable logging so log doesn't scare people
+	logger.SetLogger(logger.NullLogger)
+	defer func() { c.Check(logger.SimpleSetup(), IsNil) }()
+
 	parser := flags.NewParser(&struct{}{}, 0)
 	arg, err := parser.AddCommand("mock", "shortHelp", "longHelp", &struct{}{})
 	c.Assert(err, IsNil)

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-10-15 18:49:10 +0000
+++ helpers/helpers_test.go	2015-10-19 12:02:38 +0000
@@ -298,6 +298,9 @@
 
 func (ts *HTestSuite) TestCurrentHomeDirNoHomeEnv(c *C) {
 	oldHome := os.Getenv("HOME")
+	if oldHome == "/sbuild-nonexistent" {
+		c.Skip("running in schroot this test won't work")
+	}
 	defer os.Setenv("HOME", oldHome)
 
 	os.Setenv("HOME", "")

=== modified file 'i18n/i18n.go'
--- i18n/i18n.go	2015-06-30 10:38:55 +0000
+++ i18n/i18n.go	2015-10-19 12:02:38 +0000
@@ -25,6 +25,9 @@
 	"github.com/gosexy/gettext"
 )
 
+// TEXTDOMAIN is the message domain used by snappy; see dgettext(3)
+// for more information.
+//
 // Note that we have to use dgettext() here because we are a library
 // and we can not use getext.Textdomain() as this would override the
 // applications default

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-10-07 16:07:35 +0000
+++ snappy/parts.go	2015-10-19 12:02:38 +0000
@@ -257,7 +257,8 @@
 	return res, nil
 }
 
-// ActiveSnapNamesByType returns all installed snap names with the given type
+// ActiveSnapIterByType returns the result of applying the given
+// function to all active snaps with the given type.
 var ActiveSnapIterByType = activeSnapIterByTypeImpl
 
 func activeSnapIterByTypeImpl(f func(Part) string, snapTs ...pkg.Type) ([]string, error) {