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

[Leo Arias]

Updated the service tests to use a local snap.

[lp:~elopio/snappy/examples4]

764. By Leo Arias on 2015-10-14

Merged with parent.

[Federico Gimenez (fgimenez)]

LGTM, thanks!

A minor comment inline, feel free to ignore it :)

review: Approve

[lp:~elopio/snappy/examples4]

765. By Leo Arias on 2015-10-14

Removed the hardcoded snap name.

=== added directory '_integration-tests/data/snaps/basic-service'
=== added directory '_integration-tests/data/snaps/basic-service/bin'
=== added file '_integration-tests/data/snaps/basic-service/bin/start'
--- _integration-tests/data/snaps/basic-service/bin/start	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/basic-service/bin/start	2015-10-14 23:04:41 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+while :; do echo 'Service running'; sleep 10; done

=== added directory '_integration-tests/data/snaps/basic-service/meta'
=== added file '_integration-tests/data/snaps/basic-service/meta/package.yaml'
--- _integration-tests/data/snaps/basic-service/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/basic-service/meta/package.yaml	2015-10-14 23:04:41 +0000
@@ -0,0 +1,8 @@
+name: basic-service
+version: 1.0
+vendor: Snappy Developers <[e-mail]>
+icon: meta/snappy64.png
+services:
+  - name: service
+    start: ./bin/start
+    description: Test service

=== added file '_integration-tests/data/snaps/basic-service/meta/readme.md'
--- _integration-tests/data/snaps/basic-service/meta/readme.md	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/snaps/basic-service/meta/readme.md	2015-10-14 23:04:41 +0000
@@ -0,0 +1,3 @@
+Basic-service snap
+
+A basic buildable snap with a service.

=== added file '_integration-tests/data/snaps/basic-service/meta/snappy64.png'
Binary files _integration-tests/data/snaps/basic-service/meta/snappy64.png	1970-01-01 00:00:00 +0000 and _integration-tests/data/snaps/basic-service/meta/snappy64.png	2015-10-14 23:04:41 +0000 differ
=== modified file '_integration-tests/tests/service_test.go'
--- _integration-tests/tests/service_test.go	2015-10-08 05:57:00 +0000
+++ _integration-tests/tests/service_test.go	2015-10-14 23:04:41 +0000
@@ -21,10 +21,13 @@
 
 import (
 	"fmt"
+	"os"
 	"regexp"
 
+	"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"
 	"launchpad.net/snappy/_integration-tests/testutils/wait"
 
 	"gopkg.in/check.v1"
@@ -38,25 +41,23 @@
 
 func (s *serviceSuite) TearDownTest(c *check.C) {
 	if !common.NeedsReboot() && common.CheckRebootMark("") {
-		common.RemoveSnap(c, "hello-dbus-fwk.canonical")
+		common.RemoveSnap(c, data.BasicServiceSnapName)
 	}
 	// run cleanup last
 	s.SnappySuite.TearDownTest(c)
 }
 
 func isServiceRunning(c *check.C) bool {
-	packageVersion := common.GetCurrentVersion(c, "hello-dbus-fwk")
-	service := fmt.Sprintf("hello-dbus-fwk_srv_%s.service", packageVersion)
+	packageVersion := common.GetCurrentVersion(c, data.BasicServiceSnapName)
+	service := fmt.Sprintf("%s_service_%s.service", data.BasicServiceSnapName, packageVersion)
 
 	err := wait.ForActiveService(c, service)
 	c.Assert(err, check.IsNil)
 
-	statusOutput := cli.ExecCommand(
-		c, "systemctl", "status",
-		service)
+	statusOutput := cli.ExecCommand(c, "systemctl", "status", service)
 
 	expected := "(?ms)" +
-		".* hello-dbus-fwk_srv_.*\\.service .*\n" +
+		fmt.Sprintf(".* %s_service_.*\\.service .*\n", data.BasicServiceSnapName) +
 		".*Loaded: loaded .*\n" +
 		".*Active: active \\(running\\) .*\n" +
 		".*"
@@ -66,15 +67,21 @@
 	return matched
 }
 
+func installSnapWithService(c *check.C) {
+	snapPath, err := build.LocalSnap(c, data.BasicServiceSnapName)
+	defer os.Remove(snapPath)
+	c.Assert(err, check.IsNil)
+	common.InstallSnap(c, snapPath)
+}
+
 func (s *serviceSuite) TestInstalledServiceMustBeStarted(c *check.C) {
-	common.InstallSnap(c, "hello-dbus-fwk.canonical")
-
+	installSnapWithService(c)
 	c.Assert(isServiceRunning(c), check.Equals, true)
 }
 
 func (s *serviceSuite) TestServiceMustBeStartedAfterReboot(c *check.C) {
 	if common.BeforeReboot() {
-		common.InstallSnap(c, "hello-dbus-fwk.canonical")
+		installSnapWithService(c)
 		common.Reboot(c)
 	} else if common.AfterReboot(c) {
 		common.RemoveRebootMark(c)
@@ -84,7 +91,7 @@
 
 func (s *serviceSuite) TestServiceMustBeStartedAfterUpdate(c *check.C) {
 	if common.BeforeReboot() {
-		common.InstallSnap(c, "hello-dbus-fwk.canonical")
+		installSnapWithService(c)
 		common.CallFakeUpdate(c)
 		common.Reboot(c)
 	} else if common.AfterReboot(c) {

=== modified file '_integration-tests/testutils/data/data.go'
--- _integration-tests/testutils/data/data.go	2015-10-13 17:34:10 +0000
+++ _integration-tests/testutils/data/data.go	2015-10-14 23:04:41 +0000
@@ -28,6 +28,8 @@
 	BasicBinariesSnapName = "basic-binaries"
 	// BasicFrameworkSnapName is the name of the basic framework snap
 	BasicFrameworkSnapName = "basic-framework"
+	// BasicServiceSnapName is the name of the basic snap with a service
+	BasicServiceSnapName = "basic-service"
 	// WrongYamlSnapName is the name of a snap with an invalid meta yaml
 	WrongYamlSnapName = "wrong-yaml"
 	// MissingReadmeSnapName is the name of a snap without readme