Merge lp:~ogra/snappy/fix-interfaces-file into lp:~snappy-dev/snappy/snappy-moved-to-github

[Oliver Grawert]

add "auto ..." line to /etc/network/interfaces.d/ file

add "auto ..." line to /etc/network/interfaces.d/ file

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~ogra/snappy/fix-interfaces-file 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/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gosexy/gettext failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 15347ef417a300349807983f15af9e65cd2e1b3a
update golang.org/x/crypto failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update gopkg.in/check.v1 failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
Building
Running tests from /home/tarmac/tmp/tmp.gbOdlTsURl/src/launchpad.net/snappy
=== RUN Test
OK: 16 passed
--- PASS: Test (0.35 seconds)
PASS
coverage: 74.8% of statements
ok launchpad.net/snappy/clickdeb 0.357s coverage: 74.8% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 12.9% of statements
ok launchpad.net/snappy/cmd/snappy 0.033s coverage: 12.9% 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: 55 passed
--- PASS: Test (0.40 seconds)
PASS
coverage: 81.4% of statements
ok launchpad.net/snappy/helpers 0.413s coverage: 81.4% of statements
=== RUN Test
OK: 2 passed
--- PASS: Test (0.05 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/i18n 0.058s coverage: 100.0% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 93.5% of statements
ok launchpad.net/snappy/logger 0.008s coverage: 93.5% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/oauth 0.005s coverage: 100.0% of statements
=== RUN Test
OK: 37 passed
--- PASS: Test (0.29 seconds)
PASS
coverage: 80.3% of statements
ok launchpad.net/snappy/partition 0.301s coverage: 80.3% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/pkg 0.004s coverage: 100.0% of statements
=== RUN Test
OK: 12 passed
--- PASS: Test (0.13 seconds)
PASS
coverage: 94.3% of statements
ok launchpad.net/snappy/policy 0.130s coverage: 94.3% of statements
=== RUN Test
OK: 5 passed
--- PASS: Test (0.20 seconds)
PASS
coverage: 91.1% of statements
ok launchpad.net/snappy/priv 0.211s coverage: 91.1% of ...

[lp:~ogra/snappy/fix-interfaces-file]

578. By Oliver Grawert on 2015-07-13

also fix the firstboot test for the added line

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'snappy/firstboot.go'
--- snappy/firstboot.go	2015-07-03 20:02:38 +0000
+++ snappy/firstboot.go	2015-07-13 15:53:58 +0000
@@ -133,7 +133,7 @@
 	}
 	eth := filepath.Base(eths[0])
 	ethfile := filepath.Join(ethdir, eth)
-	data := fmt.Sprintf("allow-hotplug %[1]s\niface %[1]s inet dhcp\n", eth)
+	data := fmt.Sprintf("auto %[1]s\n\nallow-hotplug %[1]s\niface %[1]s inet dhcp\n", eth)
 
 	return helpers.AtomicWriteFile(ethfile, []byte(data), 0644)
 }

=== modified file 'snappy/firstboot_test.go'
--- snappy/firstboot_test.go	2015-07-03 20:02:38 +0000
+++ snappy/firstboot_test.go	2015-07-13 15:53:58 +0000
@@ -148,7 +148,7 @@
 	c.Assert(fs, HasLen, 1)
 	bs, err := ioutil.ReadFile(fs[0])
 	c.Assert(err, IsNil)
-	c.Check(string(bs), Equals, "allow-hotplug eth42\niface eth42 inet dhcp\n")
+	c.Check(string(bs), Equals, "auto eth42\n\nallow-hotplug eth42\niface eth42 inet dhcp\n")
 
 }