Merge lp:~fgimenez/snappy/build-test into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

Snap build test

Includes a basic buildable snap test and two erroneous snaps to check the build errors

[Federico Gimenez (fgimenez)]

@Leo comments addressed, thx! Good idea the data directory, we can put the control template in a subdir there too

Cheers!

[lp:~fgimenez/snappy/build-test]

558. By Federico Gimenez on 2015-07-02

updated readme for wrong-yaml

[Leo Arias (elopio)]

I like this very much Federico! thanks!
I left some small comments.

[lp:~fgimenez/snappy/build-test]

559. By Federico Gimenez on 2015-07-03

renamed wrong-readme to missing-readme; added comment in yaml file for wrong-yaml; using defer to remove installed snap

[Federico Gimenez (fgimenez)]

Thanks a lot Leo, the issues should be fixed now

Cheers!

[lp:~fgimenez/snappy/build-test]

560. By Federico Gimenez on 2015-07-03

basic snap name parameterized

561. By Federico Gimenez on 2015-07-03

rename wrong readme test

562. By Federico Gimenez on 2015-07-03

merged trunk

[Leo Arias (elopio)]

+11!

changing to needs info, because I think you added this file by mistake:
=== added file '_integration-tests/data/snaps/basic/basic_1.0_all.snap'

Or maybe you have a reason I failed to notice.

review: Needs Information

[lp:~fgimenez/snappy/build-test]

563. By Federico Gimenez on 2015-07-04

removedd snap file

[Federico Gimenez (fgimenez)]

No, totally by mistake, sorry :)

I'll try to setup a specific rule for the files that should be ignored in my bazaar home configuration, thanks!

[lp:~fgimenez/snappy/build-test]

564. By Federico Gimenez on 2015-07-04

removing generated snap file after the test

[Federico Gimenez (fgimenez)]

A little better now, the generated snap file is removed after the test.

Cheers!

[Leo Arias (elopio)]

I'm testing this with image #92 because I still can't udf the latest one. I'm getting this error:

basic_1.0_all.snap failed to install: Signature verification failed: No signatures, or no origin signature. (exit code 10)

With --allow-unauthenticated, it passes:

http://paste.ubuntu.com/11824532/

review: Needs Fixing

[Federico Gimenez (fgimenez)]

mmm I have it passing with the current code [1], what command did you use to generate the #92 image? Did you include --developer-mode?

Which brings another question, why aren't you able to use udf? These are my installed versions [2]

Thanks!

[1] http://paste.ubuntu.com/11824606/
[2] http://paste.ubuntu.com/11824619/

[Leo Arias (elopio)]

mmm, weird.

I installed udf from the proposed ppa, and I could flash the latest and it worked there indeed. So, approving.

I don't understand why it failed on 92, but lets keep running it and if we see a signature failure we dig deeper on it.

To answer your questinos, I generated #92 just by hardcoding "92" on the calls to createImage. So it has --developer-mode, because I didn't change that part of the ExecuteCommand.

I'm not able to use udf from the tools ppa because it has the guid bug. Fixed on the proposed ppa, so that's good now.

review: Approve

=== added directory '_integration-tests/data'
=== added directory '_integration-tests/data/snaps'
=== added directory '_integration-tests/data/snaps/basic'
=== added directory '_integration-tests/data/snaps/basic/meta'
=== added file '_integration-tests/data/snaps/basic/meta/package.yaml'
--- _integration-tests/data/snaps/basic/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/basic/meta/package.yaml	2015-07-04 05:49:23 +0000
@@ -0,0 +1,4 @@
+name: basic
+version: 1.0
+vendor: Snappy Developers <[e-mail]>
+icon: meta/snappy64.png

=== added file '_integration-tests/data/snaps/basic/meta/readme.md'
--- _integration-tests/data/snaps/basic/meta/readme.md	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/basic/meta/readme.md	2015-07-04 05:49:23 +0000
@@ -0,0 +1,3 @@
+Basic snap
+
+A basic buildable snap

=== added file '_integration-tests/data/snaps/basic/meta/snappy64.png'
Binary files _integration-tests/data/snaps/basic/meta/snappy64.png	1970-01-01 00:00:00 +0000 and _integration-tests/data/snaps/basic/meta/snappy64.png	2015-07-04 05:49:23 +0000 differ
=== added directory '_integration-tests/data/snaps/missing-readme'
=== added directory '_integration-tests/data/snaps/missing-readme/meta'
=== added file '_integration-tests/data/snaps/missing-readme/meta/package.yaml'
--- _integration-tests/data/snaps/missing-readme/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/missing-readme/meta/package.yaml	2015-07-04 05:49:23 +0000
@@ -0,0 +1,4 @@
+name: missing-readme
+version: 1.0
+vendor: Snappy Developers <[e-mail]>
+icon: meta/snappy64.png

=== added file '_integration-tests/data/snaps/missing-readme/meta/snappy64.png'
Binary files _integration-tests/data/snaps/missing-readme/meta/snappy64.png	1970-01-01 00:00:00 +0000 and _integration-tests/data/snaps/missing-readme/meta/snappy64.png	2015-07-04 05:49:23 +0000 differ
=== added directory '_integration-tests/data/snaps/wrong-yaml'
=== added directory '_integration-tests/data/snaps/wrong-yaml/meta'
=== added file '_integration-tests/data/snaps/wrong-yaml/meta/package.yaml'
--- _integration-tests/data/snaps/wrong-yaml/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/wrong-yaml/meta/package.yaml	2015-07-04 05:49:23 +0000
@@ -0,0 +1,5 @@
+# This is an invalid yaml, there's a missing colon after the 'name' field
+name wrong-yaml
+version: 1.0
+vendor: Snappy Developers <[e-mail]>
+icon: meta/snappy64.png

=== added file '_integration-tests/data/snaps/wrong-yaml/meta/readme.md'
--- _integration-tests/data/snaps/wrong-yaml/meta/readme.md	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/wrong-yaml/meta/readme.md	2015-07-04 05:49:23 +0000
@@ -0,0 +1,3 @@
+Wrong metadata snap
+
+A snap with an invalid meta/package.yaml

=== added file '_integration-tests/data/snaps/wrong-yaml/meta/snappy64.png'
Binary files _integration-tests/data/snaps/wrong-yaml/meta/snappy64.png	1970-01-01 00:00:00 +0000 and _integration-tests/data/snaps/wrong-yaml/meta/snappy64.png	2015-07-04 05:49:23 +0000 differ
=== modified file '_integration-tests/tests/common/common.go'
--- _integration-tests/tests/common/common.go	2015-07-01 15:02:58 +0000
+++ _integration-tests/tests/common/common.go	2015-07-04 05:49:23 +0000
@@ -186,3 +186,13 @@
 func getVersionFile() string {
 	return filepath.Join(os.Getenv("ADT_ARTIFACTS"), "version")
 }
+
+// InstallSnap executes the required command to install the specified snap
+func InstallSnap(c *check.C, packageName string) string {
+	return ExecCommand(c, "sudo", "snappy", "install", packageName)
+}
+
+// RemoveSnap executes the required command to remove the specified snap
+func RemoveSnap(c *check.C, packageName string) string {
+	return ExecCommand(c, "sudo", "snappy", "remove", packageName)
+}

=== added file '_integration-tests/tests/latest/base_test.go'
--- _integration-tests/tests/latest/base_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/latest/base_test.go	2015-07-04 05:49:23 +0000
@@ -0,0 +1,29 @@
+// -*- 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 latest
+
+import (
+	"testing"
+
+	. "gopkg.in/check.v1"
+)
+
+// Hook up gocheck into the "go test" runner.
+func Test(t *testing.T) { TestingT(t) }

=== added file '_integration-tests/tests/latest/build_test.go'
--- _integration-tests/tests/latest/build_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/latest/build_test.go	2015-07-04 05:49:23 +0000
@@ -0,0 +1,90 @@
+// -*- 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 latest
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+
+	. "../common"
+
+	. "gopkg.in/check.v1"
+)
+
+const (
+	baseSnapPath          = "_integration-tests/data/snaps"
+	basicSnapName         = "basic"
+	wrongYamlSnapName     = "wrong-yaml"
+	missingReadmeSnapName = "missing-readme"
+)
+
+var _ = Suite(&buildSuite{})
+
+type buildSuite struct {
+	SnappySuite
+}
+
+func buildSnap(c *C, snapPath string) string {
+	return ExecCommand(c, "snappy", "build", snapPath)
+}
+
+func (s *buildSuite) TestBuildBasicSnapOnSnappy(c *C) {
+	// build basic snap and check output
+	snapPath := baseSnapPath + "/" + basicSnapName
+	buildOutput := buildSnap(c, snapPath)
+	snapName := basicSnapName + "_1.0_all.snap"
+	expected := fmt.Sprintf("Generated '%s' snap\n", snapName)
+	c.Check(buildOutput, Equals, expected)
+	defer os.Remove(snapPath + "/" + snapName)
+
+	// install built snap and check output
+	installOutput := InstallSnap(c, snapName)
+	defer RemoveSnap(c, basicSnapName)
+	expected = "" +
+		"Installing " + snapName + "\n" +
+		".*Signature check failed, but installing anyway as requested\n" +
+		"Name          Date       Version Developer \n" +
+		".*\n" +
+		basicSnapName + "   .* .*  sideload  \n" +
+		".*\n"
+
+	c.Check(installOutput, Matches, expected)
+
+	// teardown, remove snap file
+	c.Assert(os.Remove(snapName), IsNil, Commentf("Error removing %s", snapName))
+}
+
+func (s *buildSuite) TestBuildWrongYamlSnapOnSnappy(c *C) {
+	commonWrongTest(c, wrongYamlSnapName, "can not parse package.yaml:.*\n")
+}
+
+func (s *buildSuite) TestBuildMissingReadmeSnapOnSnappy(c *C) {
+	commonWrongTest(c, missingReadmeSnapName, ".*readme.md: no such file or directory\n")
+}
+
+func commonWrongTest(c *C, testName, expected string) {
+	// build wrong snap and check output
+	cmd := exec.Command("snappy", "build", fmt.Sprintf("%s/%s", baseSnapPath, testName))
+	echoOutput, err := cmd.CombinedOutput()
+	c.Assert(err, NotNil, Commentf("%s should not be built", testName))
+
+	c.Assert(string(echoOutput), Matches, expected)
+}

=== modified file '_integration-tests/tests/latest/install_test.go'
--- _integration-tests/tests/latest/install_test.go	2015-07-01 15:02:58 +0000
+++ _integration-tests/tests/latest/install_test.go	2015-07-04 05:49:23 +0000
@@ -21,32 +21,24 @@
 
 import (
 	"os/exec"
-	"testing"
 
 	. "../common"
 
 	. "gopkg.in/check.v1"
 )
 
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { TestingT(t) }
-
 var _ = Suite(&installSuite{})
 
 type installSuite struct {
 	SnappySuite
 }
 
-func installSnap(c *C, packageName string) string {
-	return ExecCommand(c, "sudo", "snappy", "install", packageName)
-}
-
 func (s *installSuite) TearDownTest(c *C) {
-	ExecCommand(c, "sudo", "snappy", "remove", "hello-world")
+	RemoveSnap(c, "hello-world")
 }
 
 func (s *installSuite) TestInstallSnapMustPrintPackageInformation(c *C) {
-	installOutput := installSnap(c, "hello-world")
+	installOutput := InstallSnap(c, "hello-world")
 
 	expected := "" +
 		"Installing hello-world\n" +
@@ -59,7 +51,7 @@
 }
 
 func (s *installSuite) TestCallBinaryFromInstalledSnap(c *C) {
-	installSnap(c, "hello-world")
+	InstallSnap(c, "hello-world")
 
 	echoOutput := ExecCommand(c, "hello-world.echo")
 
@@ -67,7 +59,7 @@
 }
 
 func (s *installSuite) TestCallBinaryWithPermissionDeniedMustPrintError(c *C) {
-	installSnap(c, "hello-world")
+	InstallSnap(c, "hello-world")
 
 	cmd := exec.Command("hello-world.evil")
 	echoOutput, err := cmd.CombinedOutput()
@@ -85,7 +77,7 @@
 }
 
 func (s *installSuite) TestInfoMustPrintInstalledPackageInformation(c *C) {
-	installSnap(c, "hello-world")
+	InstallSnap(c, "hello-world")
 
 	infoOutput := ExecCommand(c, "snappy", "info")