Merge lp:~elopio/snappy/examples2 into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

Added a snap to test binaries.
Moved the hello-world tests to examples.

[lp:~elopio/snappy/examples2]

757. By Leo Arias on 2015-10-08

Moved the hello-world.evil test to examples. The hw-assign test already checks this.

[Federico Gimenez (fgimenez)]

Looks very good, I think that we should keep the TestCallBinaryWithPermissionDeniedMustPrintError test, in hwAssign we check hardware assignation (adding elements to a device cgroup) and this test checks app confinement (write permissions to a directory that can be granted through apparmor).

Thanks!

review: Needs Fixing

[Leo Arias (elopio)]

I merged with trunk.

@Federico, I moved the TestCallBinaryWithPermissionDeniedMustPrintError test to examples TestCallHelloWorldEvilMustPrintPermissionDeniedError

Can you please take a look again?

[lp:~elopio/snappy/examples2]

758. By Leo Arias on 2015-10-13

Merged with trunk.

759. By Leo Arias on 2015-10-13

Fixed fmt.

760. By Leo Arias on 2015-10-13

Moved the binaries to the existing snap.

761. By Leo Arias on 2015-10-13

Updated the snap name.

[Federico Gimenez (fgimenez)]

Thanks Leo, sorry I didn't realize at first that the test was moved, not deleted.

review: Approve

=== added file '_integration-tests/data/snaps/basic-binaries/bin/fail'
--- _integration-tests/data/snaps/basic-binaries/bin/fail	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/basic-binaries/bin/fail	2015-10-13 15:56:19 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 1

=== added file '_integration-tests/data/snaps/basic-binaries/bin/success'
--- _integration-tests/data/snaps/basic-binaries/bin/success	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/basic-binaries/bin/success	2015-10-13 15:56:19 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0

=== modified file '_integration-tests/data/snaps/basic-binaries/meta/package.yaml'
--- _integration-tests/data/snaps/basic-binaries/meta/package.yaml	2015-10-09 07:42:40 +0000
+++ _integration-tests/data/snaps/basic-binaries/meta/package.yaml	2015-10-13 15:56:19 +0000
@@ -4,3 +4,5 @@
 icon: meta/snappy64.png
 binaries:
  - name: bin/echo
+ - name: bin/success
+ - name: bin/fail

=== modified file '_integration-tests/tests/activate_test.go'
--- _integration-tests/tests/activate_test.go	2015-10-09 07:49:19 +0000
+++ _integration-tests/tests/activate_test.go	2015-10-13 15:56:19 +0000
@@ -27,10 +27,11 @@
 	"launchpad.net/snappy/_integration-tests/testutils/build"
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/data"
 )
 
 const (
-	activateSnapName    = "basic-binaries"
+	activateSnapName    = data.BasicBinariesSnapName
 	activateBinName     = activateSnapName + ".echo"
 	activateEchoOutput  = "From basic-binaries snap\n"
 	baseActivatePattern = "(?msU).*" + activateSnapName + `\s*.*\s*.*sideload`

=== modified file '_integration-tests/tests/build_test.go'
--- _integration-tests/tests/build_test.go	2015-09-28 10:35:06 +0000
+++ _integration-tests/tests/build_test.go	2015-10-13 15:56:19 +0000
@@ -26,6 +26,7 @@
 
 	"launchpad.net/snappy/_integration-tests/testutils/build"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/data"
 
 	"gopkg.in/check.v1"
 )
@@ -38,37 +39,37 @@
 
 func (s *buildSuite) TestBuildBasicSnapOnSnappy(c *check.C) {
 	// build basic snap and check output
-	snapPath, err := build.LocalSnap(c, build.BasicSnapName)
+	snapPath, err := build.LocalSnap(c, data.BasicSnapName)
 	defer os.Remove(snapPath)
 	c.Assert(err, check.IsNil)
 
 	// install built snap and check output
 	installOutput := common.InstallSnap(c, snapPath)
-	defer common.RemoveSnap(c, build.BasicSnapName)
+	defer common.RemoveSnap(c, data.BasicSnapName)
 	expected := "(?ms)" +
 		"Installing " + snapPath + "\n" +
 		".*Signature check failed, but installing anyway as requested\n" +
 		"Name +Date +Version +Developer \n" +
 		".*\n" +
-		build.BasicSnapName + " +.* +.* +sideload  \n" +
+		data.BasicSnapName + " +.* +.* +sideload  \n" +
 		".*\n"
 
 	c.Check(installOutput, check.Matches, expected)
 }
 
 func (s *buildSuite) TestBuildWrongYamlSnapOnSnappy(c *check.C) {
-	commonWrongTest(c, build.WrongYamlSnapName,
+	commonWrongTest(c, data.WrongYamlSnapName,
 		"(?msi).*Can not parse.*yaml: line 2: mapping values are not allowed in this context.*")
 }
 
 func (s *buildSuite) TestBuildMissingReadmeSnapOnSnappy(c *check.C) {
-	commonWrongTest(c, build.MissingReadmeSnapName,
+	commonWrongTest(c, data.MissingReadmeSnapName,
 		".*readme.md: no such file or directory\n")
 }
 
 func commonWrongTest(c *check.C, testName, expected string) {
 	// build wrong snap and check error
-	cmd := exec.Command("snappy", "build", fmt.Sprintf("%s/%s", build.BaseSnapPath, testName))
+	cmd := exec.Command("snappy", "build", fmt.Sprintf("%s/%s", data.BaseSnapPath, testName))
 	echoOutput, err := cmd.CombinedOutput()
 	c.Assert(err, check.NotNil, check.Commentf("%s should not be built", testName))
 

=== modified file '_integration-tests/tests/examples_test.go'
--- _integration-tests/tests/examples_test.go	2015-10-09 16:18:01 +0000
+++ _integration-tests/tests/examples_test.go	2015-10-13 15:56:19 +0000
@@ -29,6 +29,43 @@
 	"gopkg.in/check.v1"
 )
 
+var _ = check.Suite(&helloWorldExampleSuite{})
+
+type helloWorldExampleSuite struct {
+	common.SnappySuite
+}
+
+func (s *helloWorldExampleSuite) TestCallHelloWorldBinary(c *check.C) {
+	common.InstallSnap(c, "hello-world")
+	s.AddCleanup(func() {
+		common.RemoveSnap(c, "hello-world")
+	})
+
+	echoOutput := cli.ExecCommand(c, "hello-world.echo")
+
+	c.Assert(echoOutput, check.Equals, "Hello World!\n")
+}
+
+func (s *helloWorldExampleSuite) TestCallHelloWorldEvilMustPrintPermissionDeniedError(c *check.C) {
+	common.InstallSnap(c, "hello-world")
+	s.AddCleanup(func() {
+		common.RemoveSnap(c, "hello-world")
+	})
+
+	echoOutput, err := cli.ExecCommandErr("hello-world.evil")
+	c.Assert(err, check.NotNil, check.Commentf("hello-world.evil did not fail"))
+
+	expected := "" +
+		"Hello Evil World!\n" +
+		"This example demonstrates the app confinement\n" +
+		"You should see a permission denied error next\n" +
+		"/apps/hello-world.canonical/.*/bin/evil: \\d+: " +
+		"/apps/hello-world.canonical/.*/bin/evil: " +
+		"cannot create /var/tmp/myevil.txt: Permission denied\n"
+
+	c.Assert(string(echoOutput), check.Matches, expected)
+}
+
 var _ = check.Suite(&webserverExampleSuite{})
 
 type webserverExampleSuite struct {

=== modified file '_integration-tests/tests/info_test.go'
--- _integration-tests/tests/info_test.go	2015-10-08 06:40:06 +0000
+++ _integration-tests/tests/info_test.go	2015-10-13 15:56:19 +0000
@@ -26,6 +26,7 @@
 	"launchpad.net/snappy/_integration-tests/testutils/build"
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/data"
 
 	"gopkg.in/check.v1"
 )
@@ -55,17 +56,17 @@
 }
 
 func (s *infoSuite) TestInfoMustPrintInstalledApps(c *check.C) {
-	snapPath, err := build.LocalSnap(c, build.BasicSnapName)
+	snapPath, err := build.LocalSnap(c, data.BasicSnapName)
 	defer os.Remove(snapPath)
 	c.Assert(err, check.IsNil)
 	common.InstallSnap(c, snapPath)
-	defer common.RemoveSnap(c, build.BasicSnapName)
+	defer common.RemoveSnap(c, data.BasicSnapName)
 
 	infoOutput := cli.ExecCommand(c, "snappy", "info")
 
 	expected := "(?ms)" +
 		".*" +
-		"^apps: .*" + build.BasicSnapName + "\\.sideload.*\n"
+		"^apps: .*" + data.BasicSnapName + "\\.sideload.*\n"
 	c.Assert(infoOutput, check.Matches, expected)
 }
 

=== modified file '_integration-tests/tests/installApp_test.go'
--- _integration-tests/tests/installApp_test.go	2015-10-08 06:45:29 +0000
+++ _integration-tests/tests/installApp_test.go	2015-10-13 15:56:19 +0000
@@ -20,10 +20,13 @@
 package tests
 
 import (
+	"os"
 	"os/exec"
 
+	"launchpad.net/snappy/_integration-tests/testutils/build"
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/data"
 
 	"gopkg.in/check.v1"
 )
@@ -50,36 +53,26 @@
 	c.Assert(installOutput, check.Matches, expected)
 }
 
-func (s *installAppSuite) TestCallBinaryFromInstalledSnap(c *check.C) {
-	common.InstallSnap(c, "hello-world")
-	s.AddCleanup(func() {
-		common.RemoveSnap(c, "hello-world")
-	})
-
-	echoOutput := cli.ExecCommand(c, "hello-world.echo")
-
-	c.Assert(echoOutput, check.Equals, "Hello World!\n")
+func (s *installAppSuite) TestCallSuccessfulBinaryFromInstalledSnap(c *check.C) {
+	snapPath, err := build.LocalSnap(c, data.BasicBinariesSnapName)
+	defer os.Remove(snapPath)
+	c.Assert(err, check.IsNil)
+	common.InstallSnap(c, snapPath)
+	defer common.RemoveSnap(c, data.BasicBinariesSnapName)
+
+	// Exec command does not fail.
+	cli.ExecCommand(c, "basic-binaries.success")
 }
 
-func (s *installAppSuite) TestCallBinaryWithPermissionDeniedMustPrintError(c *check.C) {
-	common.InstallSnap(c, "hello-world")
-	s.AddCleanup(func() {
-		common.RemoveSnap(c, "hello-world")
-	})
-
-	cmd := exec.Command("hello-world.evil")
-	echoOutput, err := cmd.CombinedOutput()
-	c.Assert(err, check.NotNil, check.Commentf("hello-world.evil did not fail"))
-
-	expected := "" +
-		"Hello Evil World!\n" +
-		"This example demonstrates the app confinement\n" +
-		"You should see a permission denied error next\n" +
-		"/apps/hello-world.canonical/.*/bin/evil: \\d+: " +
-		"/apps/hello-world.canonical/.*/bin/evil: " +
-		"cannot create /var/tmp/myevil.txt: Permission denied\n"
-
-	c.Assert(string(echoOutput), check.Matches, expected)
+func (s *installAppSuite) TestCallFailBinaryFromInstalledSnap(c *check.C) {
+	snapPath, err := build.LocalSnap(c, data.BasicBinariesSnapName)
+	defer os.Remove(snapPath)
+	c.Assert(err, check.IsNil)
+	common.InstallSnap(c, snapPath)
+	defer common.RemoveSnap(c, data.BasicBinariesSnapName)
+
+	_, err = cli.ExecCommandErr("basic-binaries.fail")
+	c.Assert(err, check.NotNil, check.Commentf("The binary did not fail"))
 }
 
 func (s *installAppSuite) TestInstallUnexistingAppMustPrintError(c *check.C) {

=== modified file '_integration-tests/tests/snapd_1_0_packages_test.go'
--- _integration-tests/tests/snapd_1_0_packages_test.go	2015-10-08 08:55:17 +0000
+++ _integration-tests/tests/snapd_1_0_packages_test.go	2015-10-13 15:56:19 +0000
@@ -24,6 +24,7 @@
 
 	"launchpad.net/snappy/_integration-tests/testutils/build"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/data"
 
 	"gopkg.in/check.v1"
 )
@@ -64,14 +65,14 @@
 func (s *snapd10PackagesTestSuite) SetUpTest(c *check.C) {
 	s.snapdTestSuite.SetUpTest(c)
 	var err error
-	s.snapPath, err = build.LocalSnap(c, build.BasicSnapName)
+	s.snapPath, err = build.LocalSnap(c, data.BasicSnapName)
 	c.Assert(err, check.IsNil)
 }
 
 func (s *snapd10PackagesTestSuite) TearDownTest(c *check.C) {
 	s.snapdTestSuite.TearDownTest(c)
 	os.Remove(s.snapPath)
-	common.RemoveSnap(c, build.BasicSnapName)
+	common.RemoveSnap(c, data.BasicSnapName)
 }
 
 func (s *snapd10PackagesTestSuite) resource() string {
@@ -92,7 +93,7 @@
 		payload:     s.snapPath,
 		waitPattern: `(?U){.*,"status":"active".*"status":"OK","status_code":200,"type":"sync"}`,
 		waitFunction: func() (string, error) {
-			output, err := genericRequest(s.resource()+"/"+build.BasicSnapName+".sideload", "GET", nil)
+			output, err := genericRequest(s.resource()+"/"+data.BasicSnapName+".sideload", "GET", nil)
 			return string(output), err
 		}}}
 }

=== modified file '_integration-tests/testutils/build/snap.go'
--- _integration-tests/testutils/build/snap.go	2015-09-30 11:06:40 +0000
+++ _integration-tests/testutils/build/snap.go	2015-10-13 15:56:19 +0000
@@ -25,20 +25,10 @@
 
 	"gopkg.in/check.v1"
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
-)
-
-const (
-	// BaseSnapPath is the path for the snap sources used in testing
-	BaseSnapPath = "_integration-tests/data/snaps"
-	// BasicSnapName is the name of the basic snap
-	BasicSnapName = "basic"
-	// WrongYamlSnapName is the name of a snap with an invalid meta yaml
-	WrongYamlSnapName = "wrong-yaml"
-	// MissingReadmeSnapName is the name of a snap without readme
-	MissingReadmeSnapName = "missing-readme"
-
-	snapFilenameSufix = "_1.0_all.snap"
-)
+	"launchpad.net/snappy/_integration-tests/testutils/data"
+)
+
+const snapFilenameSufix = "_1.0_all.snap"
 
 var (
 	// dependency aliasing
@@ -67,5 +57,5 @@
 }
 
 func buildPath(snap string) string {
-	return filepath.Join(BaseSnapPath, snap)
+	return filepath.Join(data.BaseSnapPath, snap)
 }

=== added directory '_integration-tests/testutils/data'
=== added file '_integration-tests/testutils/data/data.go'
--- _integration-tests/testutils/data/data.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/data/data.go	2015-10-13 15:56:19 +0000
@@ -0,0 +1,33 @@
+// -*- 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 data
+
+const (
+	// BaseSnapPath is the path for the snap sources used in testing
+	BaseSnapPath = "_integration-tests/data/snaps"
+	// BasicSnapName is the name of the basic snap
+	BasicSnapName = "basic"
+	// BasicBinariesSnapName is the name of the basic snap with binaries
+	BasicBinariesSnapName = "basic-binaries"
+	// WrongYamlSnapName is the name of a snap with an invalid meta yaml
+	WrongYamlSnapName = "wrong-yaml"
+	// MissingReadmeSnapName is the name of a snap without readme
+	MissingReadmeSnapName = "missing-readme"
+)