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

[Leo Arias]

Translated the install framework test to go.

[Federico Gimenez (fgimenez)]

I have TestFrameworkServiceMustBeStartedAfterReboot and TestInstalledFrameworkServiceMustBeStarted failing, perhaps because of the way I'm running the test (create the image with a patched udf, spin it up with kvm, manually ifup'ing ens3 and executing the tests with -ip and -port) lots of moving parts to determine where the errors might come from :)

Anyway, this is the output, [1] for TestFrameworkServiceMustBeStartedAfterReboot and [2] for TestInstalledFrameworkServiceMustBeStarted

Thanks!

[1] http://paste.ubuntu.com/11877938/
[2] http://paste.ubuntu.com/11877944/

[Leo Arias (elopio)]

Thanks for catching that Federico.
I've pushed a version that doesn't use globbing, and reported this bug:
https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1474426

[Leo Arias (elopio)]

Back to work in progress because this will now conflict with the branch that splits main.

[Leo Arias (elopio)]

scratch that. This one is ready, I left the comment on the wrong branch.

[Federico Gimenez (fgimenez)]

Working fine now.

review: Approve (tested)

=== removed file '_integration-tests/tests/07_test_install_framework'
--- _integration-tests/tests/07_test_install_framework	2015-06-15 15:36:29 +0000
+++ _integration-tests/tests/07_test_install_framework	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-test() {
-    if after_reboot; then
-        # ensure the service comes up after a reboot, give it time
-        # to start (i.e. avoid race between framework and ssh)
-        TIMEOUT=60
-        for i in $(seq $TIMEOUT); do
-            services=$(systemctl | grep "${framework}_.*.service")
-            if [ -n "$services" ]; then
-                echo "Service $framework ready"
-                break
-            fi
-            echo "Waiting for $framework to come up ($i)"
-            sleep 1
-        done
-        if [ $i = $TIMEOUT ]; then
-            fail "$framework provided no services"
-        fi
-        return
-    fi
-
-    # we test that the final line contains the framework command
-    # FIXME: test progress here too
-    T="$framework[[:space:]]+[0-9]{4}-[0-9]{2}-[0-9]{2}[[:space:]]+[0-9]+\.[0-9]+"
-    test_regexp "$T" sudo $SNAPPY install "$framework_full"
-
-    # ensure its there
-    services=$(systemctl | grep "${framework}_.*.service")
-    [ -n "$services" ] || fail "$framework provided no services"
-
-    if can_reboot; then
-        reboot
-    fi
-}

=== modified file '_integration-tests/tests/common/common.go'
--- _integration-tests/tests/common/common.go	2015-07-08 09:10:26 +0000
+++ _integration-tests/tests/common/common.go	2015-07-14 15:55:04 +0000
@@ -58,15 +58,15 @@
 // will skip all the following tests. If the suite is being called after the
 // test bed was rebooted, it will resume the test that requested the reboot.
 func (s *SnappySuite) SetUpTest(c *check.C) {
-	if needsReboot() {
+	if NeedsReboot() {
 		contents, err := ioutil.ReadFile(needsRebootFile)
 		c.Assert(err, check.IsNil, check.Commentf("Error reading needs-reboot file %v", err))
 		c.Skip(fmt.Sprintf("****** Skipped %s during reboot caused by %s",
 			c.TestName(), contents))
 	} else {
-		if checkRebootMark("") {
+		if CheckRebootMark("") {
 			c.Logf("****** Running %s", c.TestName())
-			SetSavedVersion(c, GetCurrentVersion(c))
+			SetSavedVersion(c, GetCurrentUbuntuCoreVersion(c))
 		} else {
 			if AfterReboot(c) {
 				c.Logf("****** Resuming %s after reboot", c.TestName())
@@ -84,7 +84,7 @@
 // the test.
 // It also runs the cleanup handlers
 func (s *SnappySuite) TearDownTest(c *check.C) {
-	if !needsReboot() && checkRebootMark("") {
+	if !NeedsReboot() && CheckRebootMark("") {
 		// Only restore the channel config files if the reboot has been handled.
 		m := make(map[string]string)
 		m[channelCfgBackupFile()] = "/"
@@ -146,18 +146,24 @@
 	c.Assert(err, check.IsNil, check.Commentf("Error executing command '%v': %v", cmds, err))
 }
 
-// GetCurrentVersion returns the version number of the installed and active
-// ubuntu-core.
-func GetCurrentVersion(c *check.C) int {
+// GetCurrentVersion returns the version of the installed and active package.
+func GetCurrentVersion(c *check.C, packageName string) string {
 	output := ExecCommand(c, "snappy", "list")
-	pattern := "(?mU)^ubuntu-core (.*)$"
+	pattern := "(?mU)^" + packageName + " +(.*)$"
 	re := regexp.MustCompile(pattern)
 	match := re.FindStringSubmatch(string(output))
 	c.Assert(match, check.NotNil, check.Commentf("Version not found in %s", output))
 
 	// match is like "ubuntu-core   2015-06-18 93        ubuntu"
 	items := strings.Fields(match[0])
-	version, err := strconv.Atoi(items[2])
+	return items[2]
+}
+
+// GetCurrentUbuntuCoreVersion returns the version number of the installed and
+// active ubuntu-core.
+func GetCurrentUbuntuCoreVersion(c *check.C) int {
+	versionString := GetCurrentVersion(c, "ubuntu-core")
+	version, err := strconv.Atoi(versionString)
 	c.Assert(err, check.IsNil, check.Commentf("Error converting version to int %v", version))
 	return version
 }
@@ -178,7 +184,7 @@
 
 func fakeAvailableUpdate(c *check.C) {
 	c.Log("Faking an available update...")
-	currentVersion := GetCurrentVersion(c)
+	currentVersion := GetCurrentUbuntuCoreVersion(c)
 	switchChannelVersion(c, currentVersion, currentVersion-1)
 	SetSavedVersion(c, currentVersion-1)
 }
@@ -226,7 +232,8 @@
 	c.Assert(err, check.IsNil, check.Commentf("Error writing needs-reboot file: %v", err))
 }
 
-func needsReboot() bool {
+// NeedsReboot returns True if a reboot has been requested by a test.
+func NeedsReboot() bool {
 	_, err := os.Stat(needsRebootFile)
 	return err == nil
 }
@@ -234,17 +241,19 @@
 // BeforeReboot returns True if the test is running before the test bed has
 // been rebooted, or after the test that requested the reboot handled it.
 func BeforeReboot() bool {
-	return checkRebootMark("")
+	return CheckRebootMark("")
 }
 
 // AfterReboot returns True if the test is running after the test bed has been
 // rebooted.
 func AfterReboot(c *check.C) bool {
 	// $ADT_REBOOT_MARK contains the reboot mark, if we have rebooted it'll be the test name
-	return checkRebootMark(c.TestName())
+	return CheckRebootMark(c.TestName())
 }
 
-func checkRebootMark(mark string) bool {
+// CheckRebootMark returns True if the reboot mark matches the string passed as
+// argument.
+func CheckRebootMark(mark string) bool {
 	return os.Getenv("ADT_REBOOT_MARK") == mark
 }
 

=== modified file '_integration-tests/tests/failover/failover_test.go'
--- _integration-tests/tests/failover/failover_test.go	2015-07-07 04:22:56 +0000
+++ _integration-tests/tests/failover/failover_test.go	2015-07-14 15:55:04 +0000
@@ -48,7 +48,7 @@
 // type implementing the failer interface and call this function with an instance
 // of it
 func commonFailoverTest(c *check.C, f failer) {
-	currentVersion := GetCurrentVersion(c)
+	currentVersion := GetCurrentUbuntuCoreVersion(c)
 
 	if AfterReboot(c) {
 		RemoveRebootMark(c)

=== renamed file '_integration-tests/tests/latest/install_test.go' => '_integration-tests/tests/latest/installApp_test.go'
--- _integration-tests/tests/latest/install_test.go	2015-07-08 16:14:10 +0000
+++ _integration-tests/tests/latest/installApp_test.go	2015-07-14 15:55:04 +0000
@@ -24,22 +24,22 @@
 
 	. "../common"
 
-	. "gopkg.in/check.v1"
+	check "gopkg.in/check.v1"
 )
 
-var _ = Suite(&installSuite{})
+var _ = check.Suite(&installAppSuite{})
 
-type installSuite struct {
+type installAppSuite struct {
 	SnappySuite
 }
 
-func (s *installSuite) TearDownTest(c *C) {
+func (s *installAppSuite) TearDownTest(c *check.C) {
 	RemoveSnap(c, "hello-world")
 	// run cleanup last
 	s.SnappySuite.TearDownTest(c)
 }
 
-func (s *installSuite) TestInstallSnapMustPrintPackageInformation(c *C) {
+func (s *installAppSuite) TestInstallAppMustPrintPackageInformation(c *check.C) {
 	installOutput := InstallSnap(c, "hello-world")
 
 	expected := "(?ms)" +
@@ -49,23 +49,23 @@
 		"^hello-world +.* +.* +canonical \n" +
 		".*"
 
-	c.Assert(installOutput, Matches, expected)
+	c.Assert(installOutput, check.Matches, expected)
 }
 
-func (s *installSuite) TestCallBinaryFromInstalledSnap(c *C) {
+func (s *installAppSuite) TestCallBinaryFromInstalledSnap(c *check.C) {
 	InstallSnap(c, "hello-world")
 
 	echoOutput := ExecCommand(c, "hello-world.echo")
 
-	c.Assert(echoOutput, Equals, "Hello World!\n")
+	c.Assert(echoOutput, check.Equals, "Hello World!\n")
 }
 
-func (s *installSuite) TestCallBinaryWithPermissionDeniedMustPrintError(c *C) {
+func (s *installAppSuite) TestCallBinaryWithPermissionDeniedMustPrintError(c *check.C) {
 	InstallSnap(c, "hello-world")
 
 	cmd := exec.Command("hello-world.evil")
 	echoOutput, err := cmd.CombinedOutput()
-	c.Assert(err, NotNil, Commentf("hello-world.evil did not fail"))
+	c.Assert(err, check.NotNil, check.Commentf("hello-world.evil did not fail"))
 
 	expected := "" +
 		"Hello Evil World!\n" +
@@ -75,14 +75,14 @@
 		"/apps/hello-world.canonical/.*/bin/evil: " +
 		"cannot create /var/tmp/myevil.txt: Permission denied\n"
 
-	c.Assert(string(echoOutput), Matches, expected)
+	c.Assert(string(echoOutput), check.Matches, expected)
 }
 
-func (s *installSuite) TestInfoMustPrintInstalledPackageInformation(c *C) {
+func (s *installAppSuite) TestInfoMustPrintInstalledPackageInformation(c *check.C) {
 	InstallSnap(c, "hello-world")
 
 	infoOutput := ExecCommand(c, "snappy", "info")
 
 	expected := "(?ms).*^apps: hello-world\n"
-	c.Assert(infoOutput, Matches, expected)
+	c.Assert(infoOutput, check.Matches, expected)
 }

=== added file '_integration-tests/tests/latest/installFramework_test.go'
--- _integration-tests/tests/latest/installFramework_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/tests/latest/installFramework_test.go	2015-07-14 15:55:04 +0000
@@ -0,0 +1,88 @@
+// -*- 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"
+	"regexp"
+
+	. "../common"
+
+	check "gopkg.in/check.v1"
+)
+
+var _ = check.Suite(&installFrameworkSuite{})
+
+type installFrameworkSuite struct {
+	SnappySuite
+}
+
+func (s *installFrameworkSuite) TearDownTest(c *check.C) {
+	if !NeedsReboot() && CheckRebootMark("") {
+		RemoveSnap(c, "docker")
+	}
+	// run cleanup last
+	s.SnappySuite.TearDownTest(c)
+}
+
+func isDockerServiceRunning(c *check.C) bool {
+	dockerVersion := GetCurrentVersion(c, "docker")
+	statusOutput := ExecCommand(
+		c, "systemctl", "status",
+		fmt.Sprintf("docker_docker-daemon_%s.service", dockerVersion))
+
+	expected := "(?ms)" +
+		".* docker_docker-daemon_.*\\.service .*\n" +
+		".*Loaded: loaded .*\n" +
+		".*Active: active \\(running\\) .*\n" +
+		".*"
+
+	matched, err := regexp.MatchString(expected, statusOutput)
+	c.Assert(err, check.IsNil)
+	return matched
+}
+
+func (s *installFrameworkSuite) TestInstallFrameworkMustPrintPackageInformation(c *check.C) {
+	installOutput := InstallSnap(c, "docker")
+
+	expected := "(?ms)" +
+		"Installing docker\n" +
+		"Name +Date +Version +Developer \n" +
+		".*" +
+		"^docker +.* +.* +canonical \n" +
+		".*"
+
+	c.Assert(installOutput, check.Matches, expected)
+}
+
+func (s *installFrameworkSuite) TestInstalledFrameworkServiceMustBeStarted(c *check.C) {
+	InstallSnap(c, "docker")
+	c.Assert(isDockerServiceRunning(c), check.Equals, true)
+}
+
+func (s *installFrameworkSuite) TestFrameworkServiceMustBeStartedAfterReboot(c *check.C) {
+	if BeforeReboot() {
+		InstallSnap(c, "docker")
+		Reboot(c)
+	} else if AfterReboot(c) {
+		RemoveRebootMark(c)
+		c.Assert(isDockerServiceRunning(c), check.Equals, true)
+	}
+}

=== modified file '_integration-tests/tests/update/update_test.go'
--- _integration-tests/tests/update/update_test.go	2015-07-08 01:46:57 +0000
+++ _integration-tests/tests/update/update_test.go	2015-07-14 15:55:04 +0000
@@ -45,6 +45,6 @@
 		Reboot(c)
 	} else if AfterReboot(c) {
 		RemoveRebootMark(c)
-		c.Assert(GetCurrentVersion(c) > GetSavedVersion(c), Equals, true)
+		c.Assert(GetCurrentUbuntuCoreVersion(c) > GetSavedVersion(c), Equals, true)
 	}
 }