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

[Leo Arias]

[lp:~elopio/snappy/15.04_to_rolling]

548. By Leo Arias on 2015-07-06

Merged with trunk.

549. By Leo Arias on 2015-07-06

Merged with trunk.

550. By Leo Arias on 2015-07-06

Run only the update in the old versions, and then run the full suite.

551. By Leo Arias on 2015-07-06

Merged with trunk.

552. By Leo Arias on 2015-07-06

Merged with trunk.

553. By Leo Arias on 2015-07-06

Backup the config file.

554. By Leo Arias on 2015-07-06

Do not rollback.

555. By Leo Arias on 2015-07-06

Update the test beds and run the tests.

556. By Leo Arias on 2015-07-06

Restore the config only if the reboot has been handled.

557. By Leo Arias on 2015-07-07

Only run the update. Figure the full suite later.

558. By Leo Arias on 2015-07-07

Only run the update. Figure the full suite later.

559. By Leo Arias on 2015-07-07

No need to put the remote testbed options on the var.

560. By Leo Arias on 2015-07-07

Remove extra newline.

Unmerged revisions

=== added directory '_integration-tests/data'
=== renamed directory '_integration-tests/data' => '_integration-tests/data.moved'
=== added directory '_integration-tests/data/tpl'
=== added file '_integration-tests/data/tpl/control'
--- _integration-tests/data/tpl/control	1970-01-01 00:00:00 +0000
+++ _integration-tests/data/tpl/control	2015-07-06 06:57:52 +0000
@@ -0,0 +1,10 @@
+{{ $filter := .Filter }}
+{{ range $element := .Tests }}
+Test-Command: debian/integration-tests/snappy-test {{ $element }}.test {{ if $filter }}-gocheck.f {{ $filter }}{{ end }}
+Restrictions: allow-stderr
+{{ end }}
+
+{{ if .IncludeShell }}
+Test-Command: ./_integration-tests/snappy-selftest --yes-really
+Depends:
+{{ end }}

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-07-01 08:51:59 +0000
+++ _integration-tests/main.go	2015-07-06 06:57:52 +0000
@@ -28,34 +28,28 @@
 	"path/filepath"
 	"strconv"
 	"strings"
+	"text/template"
 )
 
 const (
-	baseDir          = "/tmp/snappy-test"
-	testsBinDir      = "_integration-tests/bin/"
-	defaultRelease   = "rolling"
-	defaultChannel   = "edge"
-	latestRevision   = ""
-	defaultSSHPort   = 22
-	defaultGoArm     = "7"
-	latestTestName   = "command1"
-	failoverTestName = "command2"
-	updateTestName   = "command3"
-	shellTestName    = "command4"
+	baseDir        = "/tmp/snappy-test"
+	testsBinDir    = "_integration-tests/bin/"
+	defaultRelease = "rolling"
+	defaultChannel = "edge"
+	defaultSSHPort = 22
+	defaultGoArm   = "7"
+	controlFile    = "debian/integration-tests/control"
+	controlTpl     = "_integration-tests/data/tpl/control"
 )
 
 var (
-	imageDir         = filepath.Join(baseDir, "image")
-	imageTarget      = filepath.Join(imageDir, "snappy.img")
-	commonSSHOptions = []string{"---", "ssh"}
-	kvmSSHOptions    = append(
-		commonSSHOptions,
-		[]string{
-			"-s", "/usr/share/autopkgtest/ssh-setup/snappy",
-			"--", "-i", imageTarget}...)
+	commonSSHOptions     = []string{"---", "ssh"}
+	testPackagesLatest   = []string{"latest", "failover"}
+	testPackagesPrevious = []string{"update"}
+	testPackages         = append(testPackagesLatest, testPackagesPrevious...)
 )
 
-func setupAndRunTests(useSnappyFromBranch bool, arch, testbedIP string, testbedPort int) {
+func setupAndRunTests(useSnappyFromBranch bool, arch, testbedIP, testFilter string, testbedPort int) {
 	prepareTargetDir(testsBinDir)
 
 	if useSnappyFromBranch {
@@ -66,21 +60,27 @@
 	buildTests(arch)
 
 	rootPath := getRootPath()
+
 	if testbedIP == "" {
-		createImage(defaultRelease, defaultChannel, latestRevision)
-		latestTests := []string{
-			latestTestName, failoverTestName, shellTestName}
-		for i := range latestTests {
-			adtRun(rootPath, kvmSSHOptions, latestTests[i])
-		}
-
-		createImage(defaultRelease, defaultChannel, "-1")
-		adtRun(rootPath, kvmSSHOptions, updateTestName)
+		var includeShell bool
+		if testFilter == "" {
+			includeShell = true
+		}
+		image := createImage(defaultRelease, defaultChannel, "")
+		adtRun(rootPath, testFilter, testPackages, kvmSSHOptions(image), includeShell)
+		// It does not make sense to run tests on previous versions using the
+		// snappy version from the branch. These other tests are only for nightly
+		// executions.
+		if !useSnappyFromBranch {
+			image = createImage(defaultRelease, defaultChannel, "-1")
+			adtRun(rootPath, testFilter, testPackages, kvmSSHOptions(image), includeShell)
+			image = createImage("15.04", "stable", "")
+			adtRun(rootPath, testFilter, testPackages, kvmSSHOptions(image), includeShell)
+		}
 	} else {
 		execCommand("ssh-copy-id", "-p", strconv.Itoa(testbedPort),
 			"ubuntu@"+testbedIP)
-		adtRun(rootPath, remoteTestbedSSHOptions(testbedIP, testbedPort),
-			shellTestName)
+		adtRun(rootPath, "", []string{}, remoteTestbedSSHOptions(testbedIP, testbedPort), true)
 	}
 }
 
@@ -103,9 +103,8 @@
 
 func buildTests(arch string) {
 	fmt.Println("Building tests...")
-	tests := []string{"latest", "failover", "update"}
-	for i := range tests {
-		testName := tests[i]
+
+	for _, testName := range testPackages {
 		goCall(arch, "test", "-c",
 			"./_integration-tests/tests/"+testName)
 		// XXX Go test 1.3 does not have the output flag, so we move the
@@ -127,42 +126,89 @@
 	execCommand(goCmd...)
 }
 
-func createImage(release, channel, revision string) {
+func createImage(release, channel, revision string) string {
 	fmt.Println("Creating image...")
+	imageDir := filepath.Join(baseDir, "image")
 	prepareTargetDir(imageDir)
+	revisionTag := revision
+	if revisionTag == "" {
+		revisionTag = "latest"
+	}
+	imageName := strings.Join(
+		[]string{"snappy", release, channel, revisionTag}, "-") + ".img"
+	imagePath := filepath.Join(imageDir, imageName)
 	udfCommand := []string{"sudo", "ubuntu-device-flash", "--verbose"}
-	if revision != latestRevision {
+	if revision != "" {
 		udfCommand = append(udfCommand, "--revision", revision)
 	}
 	coreOptions := []string{
 		"core", release,
-		"--output", imageTarget,
+		"--output", imagePath,
 		"--channel", channel,
 		"--developer-mode",
 	}
 	execCommand(append(udfCommand, coreOptions...)...)
+	return imagePath
 }
 
-func adtRun(rootPath string, testbedOptions []string, testname string) {
+func adtRun(rootPath, testFilter string, testList, testbedOptions []string, includeShell bool) {
+	createControlFile(testFilter, testList, includeShell)
+
 	fmt.Println("Calling adt-run...")
-	outputDir := filepath.Join(baseDir, "output")
+	outputSubdir := getOutputSubdir(testList, includeShell)
+	outputDir := filepath.Join(baseDir, "output", outputSubdir)
 	prepareTargetDir(outputDir)
 
 	cmd := []string{
 		"adt-run", "-B",
-		"--override-control", "debian/integration-tests/control"}
-
-	cmd = append(cmd, "--testname", testname)
-
-	cmd = append(cmd, []string{
 		"--setup-commands", "touch /run/autopkgtest_no_reboot.stamp",
-		"--override-control", "debian/integration-tests/control",
+		"--override-control", controlFile,
 		"--built-tree", rootPath,
-		"--output-dir", outputDir}...)
+		"--output-dir", outputDir}
 
 	execCommand(append(cmd, testbedOptions...)...)
 }
 
+func kvmSSHOptions(imagePath string) []string {
+	return append(
+		commonSSHOptions,
+		[]string{
+			"-s", "/usr/share/autopkgtest/ssh-setup/snappy",
+			"--", "-i", imagePath}...)
+}
+
+func createControlFile(testFilter string, testList []string, includeShellTest bool) {
+	type controlData struct {
+		Filter       string
+		Tests        []string
+		IncludeShell bool
+	}
+
+	tpl, err := template.ParseFiles(controlTpl)
+	if err != nil {
+		log.Fatalf("Error reading adt-run control template %s", controlTpl)
+	}
+
+	outputFile, err := os.Create(controlFile)
+	if err != nil {
+		log.Fatalf("Error creating control file %s", controlFile)
+	}
+	defer outputFile.Close()
+
+	err = tpl.Execute(outputFile, controlData{Filter: testFilter, Tests: testList, IncludeShell: includeShellTest})
+	if err != nil {
+		log.Fatalf("execution: %s", err)
+	}
+}
+
+func getOutputSubdir(testList []string, includeShell bool) string {
+	output := strings.Join(testList, "-")
+	if includeShell {
+		output = output + "-shell"
+	}
+	return output
+}
+
 func remoteTestbedSSHOptions(testbedIP string, testbedPort int) []string {
 	options := []string{
 		"-H", testbedIP,
@@ -199,9 +245,11 @@
 			"IP of the testbed. If no IP is passed, a virtual machine will be created for the test.")
 		testbedPort = flag.Int("port", defaultSSHPort,
 			"SSH port of the testbed. Defaults to use port "+strconv.Itoa(defaultSSHPort))
+		testFilter = flag.String("filter", "",
+			"Suites or tests to run, for instance MyTestSuite, MyTestSuite.FirstCustomTest or MyTestSuite.*CustomTest")
 	)
 
 	flag.Parse()
 
-	setupAndRunTests(*useSnappyFromBranch, *arch, *testbedIP, *testbedPort)
+	setupAndRunTests(*useSnappyFromBranch, *arch, *testbedIP, *testFilter, *testbedPort)
 }

=== modified file '_integration-tests/tests/common/common.go'
--- _integration-tests/tests/common/common.go	2015-07-02 10:41:16 +0000
+++ _integration-tests/tests/common/common.go	2015-07-06 06:57:52 +0000
@@ -33,7 +33,11 @@
 )
 
 const (
+	// BaseOtherPath FIXME needs a better name because I don't know what to
+	// comment.
+	BaseOtherPath   = "/writable/cache/system"
 	needsRebootFile = "/tmp/needs-reboot"
+	channelCfgFile  = "/etc/system-image/channel.ini"
 )
 
 // SnappySuite is a structure used as a base test suite for all the snappy
@@ -117,10 +121,52 @@
 	return version
 }
 
-// CallUpdate executes an snappy update.
+// CallUpdate executes an snappy update. If there is no update available, the
+// channel version will be modified to fake an update.
 func CallUpdate(c *check.C) {
 	c.Log("Calling snappy update...")
-	ExecCommand(c, "sudo", "snappy", "update")
+	output := ExecCommand(c, "sudo", "snappy", "update")
+	// XXX Instead of trying the update, we should have a command to tell us
+	// if there is an available update. --elopio - 2015-07-01
+	if output == "" {
+		c.Log("There is no update available.")
+		fakeAvailableUpdate(c)
+		ExecCommand(c, "sudo", "snappy", "update")
+	}
+}
+
+func fakeAvailableUpdate(c *check.C) {
+	c.Log("Faking an available update...")
+	currentVersion := GetCurrentVersion(c)
+	switchChannelVersion(c, currentVersion, currentVersion-1)
+	SetSavedVersion(c, currentVersion-1)
+}
+
+func switchChannelVersion(c *check.C, oldVersion, newVersion int) {
+	targets := []string{"/", BaseOtherPath}
+	for _, target := range targets {
+		file := filepath.Join(target, channelCfgFile)
+		if _, err := os.Stat(file); err == nil {
+			MakeWritable(c, target)
+			defer MakeReadonly(c, target)
+			ExecCommand(c,
+				"sudo", "sed", "-i",
+				fmt.Sprintf(
+					"s/build_number: %d/build_number: %d/g",
+					oldVersion, newVersion),
+				file)
+		}
+	}
+}
+
+// MakeWritable remounts a path with read and write permissions.
+func MakeWritable(c *check.C, path string) {
+	ExecCommand(c, "sudo", "mount", "-o", "remount,rw", path)
+}
+
+// MakeReadonly remounts a path with only read permissions.
+func MakeReadonly(c *check.C, path string) {
+	ExecCommand(c, "sudo", "mount", "-o", "remount,ro", path)
 }
 
 // Reboot requests a reboot using the test name as the mark.

=== modified file '_integration-tests/tests/failover/failover_rclocal_crash_test.go'
--- _integration-tests/tests/failover/failover_rclocal_crash_test.go	2015-06-29 15:57:03 +0000
+++ _integration-tests/tests/failover/failover_rclocal_crash_test.go	2015-07-06 06:57:52 +0000
@@ -30,18 +30,18 @@
 type rcLocalCrash struct{}
 
 func (rcLocalCrash) set(c *C) {
-	makeWritable(c, baseOtherPath)
-	targetFile := fmt.Sprintf("%s/etc/rc.local", baseOtherPath)
+	MakeWritable(c, BaseOtherPath)
+	defer MakeReadonly(c, BaseOtherPath)
+	targetFile := fmt.Sprintf("%s/etc/rc.local", BaseOtherPath)
 	ExecCommand(c, "sudo", "chmod", "a+xw", targetFile)
 	ExecCommandToFile(c, targetFile,
 		"sudo", "echo", "#!bin/sh\nprintf c > /proc/sysrq-trigger")
-	makeReadonly(c, baseOtherPath)
 }
 
 func (rcLocalCrash) unset(c *C) {
-	makeWritable(c, baseOtherPath)
-	ExecCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", baseOtherPath))
-	makeReadonly(c, baseOtherPath)
+	MakeWritable(c, BaseOtherPath)
+	defer MakeReadonly(c, BaseOtherPath)
+	ExecCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", BaseOtherPath))
 }
 
 func (s *failoverSuite) TestRCLocalCrash(c *C) {

=== modified file '_integration-tests/tests/failover/failover_systemd_loop_test.go'
--- _integration-tests/tests/failover/failover_systemd_loop_test.go	2015-06-29 15:57:23 +0000
+++ _integration-tests/tests/failover/failover_systemd_loop_test.go	2015-07-06 06:57:52 +0000
@@ -61,17 +61,18 @@
 type systemdDependencyLoop struct{}
 
 func (systemdDependencyLoop) set(c *C) {
-	installService(c, "deadlock", deadlockService, baseOtherPath)
-	installService(c, "emerg-reboot", rebootService, baseOtherPath)
+	installService(c, "deadlock", deadlockService, BaseOtherPath)
+	installService(c, "emerg-reboot", rebootService, BaseOtherPath)
 }
 
 func (systemdDependencyLoop) unset(c *C) {
-	unInstallService(c, "deadlock", baseOtherPath)
-	unInstallService(c, "emerg-reboot", baseOtherPath)
+	unInstallService(c, "deadlock", BaseOtherPath)
+	unInstallService(c, "emerg-reboot", BaseOtherPath)
 }
 
 func installService(c *C, serviceName, serviceCfg, basePath string) {
-	makeWritable(c, basePath)
+	MakeWritable(c, basePath)
+	defer MakeReadonly(c, basePath)
 
 	// Create service file
 	serviceFile := fmt.Sprintf("%s%s/%s.service", basePath, baseSystemdPath, serviceName)
@@ -89,12 +90,11 @@
 		fmt.Sprintf("%s/%s.service", baseSystemdPath, serviceName),
 		fmt.Sprintf("%s/%s.service", requiresDirPart, serviceName),
 	)
-
-	makeReadonly(c, basePath)
 }
 
 func unInstallService(c *C, serviceName, basePath string) {
-	makeWritable(c, basePath)
+	MakeWritable(c, basePath)
+	defer MakeReadonly(c, basePath)
 
 	// Disable the service
 	ExecCommand(c, "sudo", "chroot", basePath,
@@ -107,8 +107,6 @@
 	// Remove the requires symlink
 	ExecCommand(c, "sudo", "rm",
 		fmt.Sprintf("%s%s/%s/%s.service", basePath, baseSystemdPath, systemdTargetRequiresDir, serviceName))
-
-	makeReadonly(c, basePath)
 }
 
 func (s *failoverSuite) TestSystemdDependencyLoop(c *C) {

=== modified file '_integration-tests/tests/failover/failover_test.go'
--- _integration-tests/tests/failover/failover_test.go	2015-07-01 15:02:58 +0000
+++ _integration-tests/tests/failover/failover_test.go	2015-07-06 06:57:52 +0000
@@ -20,9 +20,6 @@
 package failover
 
 import (
-	"fmt"
-	"os"
-	"path/filepath"
 	"testing"
 
 	. "../common"
@@ -39,11 +36,6 @@
 	SnappySuite
 }
 
-const (
-	baseOtherPath  = "/writable/cache/system"
-	channelCfgFile = "/etc/system-image/channel.ini"
-)
-
 // The types that implement this interface can be used in the test logic
 type failer interface {
 	// Sets the failure conditions
@@ -56,42 +48,13 @@
 // type implementing the failer interface and call this function with an instance
 // of it
 func commonFailoverTest(c *C, f failer) {
-	currentVersion := GetCurrentVersion(c)
-
 	if AfterReboot(c) {
 		RemoveRebootMark(c)
 		f.unset(c)
-		c.Assert(GetSavedVersion(c), Equals, currentVersion)
+		c.Assert(GetSavedVersion(c), Equals, GetCurrentVersion(c))
 	} else {
-		switchChannelVersion(c, currentVersion, currentVersion-1)
-		SetSavedVersion(c, currentVersion-1)
 		CallUpdate(c)
 		f.set(c)
 		Reboot(c)
 	}
 }
-
-func switchChannelVersion(c *C, oldVersion, newVersion int) {
-	targets := []string{"/", baseOtherPath}
-	for _, target := range targets {
-		file := filepath.Join(target, channelCfgFile)
-		if _, err := os.Stat(file); err == nil {
-			makeWritable(c, target)
-			ExecCommand(c,
-				"sudo", "sed", "-i",
-				fmt.Sprintf(
-					"s/build_number: %d/build_number: %d/g",
-					oldVersion, newVersion),
-				file)
-			makeReadonly(c, target)
-		}
-	}
-}
-
-func makeWritable(c *C, path string) {
-	ExecCommand(c, "sudo", "mount", "-o", "remount,rw", path)
-}
-
-func makeReadonly(c *C, path string) {
-	ExecCommand(c, "sudo", "mount", "-o", "remount,ro", path)
-}

=== modified file '_integration-tests/tests/failover/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover/failover_zero_size_file_test.go	2015-06-29 15:52:59 +0000
+++ _integration-tests/tests/failover/failover_zero_size_file_test.go	2015-07-06 06:57:52 +0000
@@ -70,32 +70,32 @@
 func commonSet(c *C, origPattern, filename string) {
 	filenamePattern := fmt.Sprintf(origPattern, "", filename)
 	completePattern := filepath.Join(
-		baseOtherPath,
+		BaseOtherPath,
 		filenamePattern)
 	oldFilename := getSingleFilename(c, completePattern)
 	filenameSuffix := fmt.Sprintf(
 		strings.Replace(origPattern, "*", "", 1), destFilenamePrefix, filepath.Base(oldFilename))
 	newFilename := fmt.Sprintf(
-		"%s/%s", baseOtherPath, filenameSuffix)
+		"%s/%s", BaseOtherPath, filenameSuffix)
 
-	renameFile(c, baseOtherPath, oldFilename, newFilename)
+	renameFile(c, BaseOtherPath, oldFilename, newFilename)
 }
 
 func commonUnset(c *C, origPattern, filename string) {
 	completePattern := filepath.Join(
-		baseOtherPath,
+		BaseOtherPath,
 		fmt.Sprintf(origPattern, destFilenamePrefix, filename))
 	oldFilename := getSingleFilename(c, completePattern)
 	newFilename := strings.Replace(oldFilename, destFilenamePrefix, "", 1)
 
-	renameFile(c, baseOtherPath, oldFilename, newFilename)
+	renameFile(c, BaseOtherPath, oldFilename, newFilename)
 }
 
 func renameFile(c *C, basePath, oldFilename, newFilename string) {
-	makeWritable(c, basePath)
+	MakeWritable(c, basePath)
+	defer MakeReadonly(c, basePath)
 	ExecCommand(c, "sudo", "mv", oldFilename, newFilename)
 	ExecCommand(c, "sudo", "touch", oldFilename)
-	makeReadonly(c, basePath)
 }
 
 func getSingleFilename(c *C, pattern string) string {

=== modified file '_integration-tests/tests/update/update_test.go'
--- _integration-tests/tests/update/update_test.go	2015-06-30 16:51:24 +0000
+++ _integration-tests/tests/update/update_test.go	2015-07-06 06:57:52 +0000
@@ -45,7 +45,10 @@
 	}
 }
 
-func (s *updateSuite) TestUpdateMustInstallNewerVersion(c *C) {
+// Test that the update to the same release and channel must install a newer
+// version. If there is no update available, the channel version will be
+// modified to fake an update.
+func (s *updateSuite) TestUpdateToSameReleaseAndChannel(c *C) {
 	if BeforeReboot() {
 		CallUpdate(c)
 		Reboot(c)

=== removed file 'debian/integration-tests/control'
--- debian/integration-tests/control	2015-06-30 15:29:28 +0000
+++ debian/integration-tests/control	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Test-Command: debian/integration-tests/snappy-test latest.test
-Restrictions: allow-stderr
-
-Test-Command: debian/integration-tests/snappy-test failover.test
-Restrictions: allow-stderr
-
-Test-Command: debian/integration-tests/snappy-test update.test
-Restrictions: allow-stderr
-
-Test-Command: ./_integration-tests/snappy-selftest --yes-really
-Depends:

=== modified file 'debian/integration-tests/snappy-test'
--- debian/integration-tests/snappy-test	2015-07-03 11:04:00 +0000
+++ debian/integration-tests/snappy-test	2015-07-06 06:57:52 +0000
@@ -23,7 +23,10 @@
 
 export PATH=$(pwd)/_integration-tests/bin:$PATH
 
-${TEST} -check.vv -test.outputdir=$ADT_ARTIFACTS-$ADT_REBOOT_MARK
+# shift to remove the test binary name (first argument) and be able to pass the rest
+# of them to it
+shift
+${TEST} -check.vv -test.outputdir=$ADT_ARTIFACTS-$ADT_REBOOT_MARK "$@"
 
 if [ -e ${NEEDS_REBOOT} ]; then
     mark=`cat ${NEEDS_REBOOT}`