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

[Leo Arias]

On integration tests, fixed newKernelFilenamePattern.

[Federico Gimenez (fgimenez)]

Thanks for this, Leo, hopefully we'll get this make this work soon with the new kernel files layout.

I'm getting an error in an installApp test not related to these changes, probably we haven't merged the branch that fixes this yet, let me know if it's an issue for you too:

/home/fgimenez/workspace/snappy/new_kernel_file_name/_integration-tests/tests/installApp_test.go:122:
    ...open /home/fgimenez/workspace/snappy/new_kernel_file_name/_integration-tests/tests/installApp_test.go: no such file or directory
... obtained string = "" +
... "Installing unexisting.canonical\n" +
... "unexisting failed to install: snappy package not found\n"
... expected string = "" +
... "Installing unexisting.canonical\n" +
... "unexisting.canonical failed to install: snappy package not found\n"

After fixing it I get this one that may be actually related to the changes:

****** Resuming failoverSuite.TestZeroSizeInitrd after reboot
PASS: <autogenerated>:15: failoverSuite.SetUpTest 0.000s

snappy list
Name Date Version Developer
ubuntu-core 2015-09-22 180 ubuntu
generic-amd64 2015-09-22 1.4 canonical
/home/fgimenez/workspace/snappy/new_kernel_file_name/_integration-tests/tests/failover_zero_size_file_test.go:197:
    ...open /home/fgimenez/workspace/snappy/new_kernel_file_name/_integration-tests/tests/failover_zero_size_file_test.go: no such file or directory
/home/fgimenez/workspace/snappy/new_kernel_file_name/_integration-tests/tests/failover_zero_size_file_test.go:142:
    ...open /home/fgimenez/workspace/snappy/new_kernel_file_name/_integration-tests/tests/failover_zero_size_file_test.go: no such file or directory
... obtained int = 0
... expected int = 1
... 0 files matching /boot/grub/a/snappy-selftest-initrd*, 1 expected

It seems that after the failover it boots correctly but when tries to revert the changes it tries to do find the modified files in the a partition. If things went good during the setup of the failure this should be the b partition, can you please confirm?

[Federico Gimenez (fgimenez)]

review: Needs Information

[Leo Arias (elopio)]

I removed the classic kernel files stuff, and now it's passing in 15.04 and rolling. Please confirm.

[Federico Gimenez (fgimenez)]

Worked 5 times in a row, approving

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~elopio/snappy/new_kernel_file_name into lp:snappy failed. Below is the output from the failed tests.

Checking docs
Checking formatting
Formatting wrong in following files
_integration-tests/tests/failover_zero_size_file_test.go

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/snappy
cp -a . $GOPATH/src/launchpad.net/snappy/
cd $GOPATH/src/launchpad.net/snappy

sh -v ./run-checks
#!/bin/sh

set -eu

if which goctest >/dev/null; then
    goctest="goctest"
else
    goctest="go test"
fi

QUICK=""
if [ "${1:-}" = "--quick" ]; then
    QUICK=yes
fi

echo Checking docs
./mdlint.py docs/*.md

echo Checking formatting
fmt=$(gofmt -l .)

if [ -n "$fmt" ]; then
    echo "Formatting wrong in following files"
    echo "$fmt"
    exit 1
fi

[lp:~elopio/snappy/new_kernel_file_name]

716. By Leo Arias on 2015-09-25

Fixed fmt.

=== modified file '_integration-tests/tests/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover_zero_size_file_test.go	2015-09-13 02:52:52 +0000
+++ _integration-tests/tests/failover_zero_size_file_test.go	2015-09-25 14:35:42 +0000
@@ -53,29 +53,21 @@
 }
 
 func (zeroSizeInitrd) set(c *check.C) {
-	if classicKernelFiles(c) {
-		commonSet(c, BaseAltPartitionPath, origBootFilenamePattern, initrdFilename)
-	} else {
-		boot, err := partition.BootSystem()
-		c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
-		dir := partition.BootDir(boot)
+	boot, err := partition.BootSystem()
+	c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
+	dir := partition.BootDir(boot)
 
-		bootFileNamePattern := newKernelFilenamePattern(c, boot, true)
-		commonSet(c, dir, bootFileNamePattern, initrdFilename)
-	}
+	bootFileNamePattern := newKernelFilenamePattern(c, boot, true)
+	commonSet(c, dir, bootFileNamePattern, initrdFilename)
 }
 
 func (zeroSizeInitrd) unset(c *check.C) {
-	if classicKernelFiles(c) {
-		commonUnset(c, BaseAltPartitionPath, origBootFilenamePattern, initrdFilename)
-	} else {
-		boot, err := partition.BootSystem()
-		c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
-		dir := partition.BootDir(boot)
+	boot, err := partition.BootSystem()
+	c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
+	dir := partition.BootDir(boot)
 
-		bootFileNamePattern := newKernelFilenamePattern(c, boot, false)
-		commonUnset(c, dir, bootFileNamePattern, initrdFilename)
-	}
+	bootFileNamePattern := newKernelFilenamePattern(c, boot, false)
+	commonUnset(c, dir, bootFileNamePattern, initrdFilename)
 }
 
 func (zeroSizeSystemd) set(c *check.C) {
@@ -144,15 +136,6 @@
 	return matches[0]
 }
 
-func classicKernelFiles(c *check.C) bool {
-	initrdClassicFilenamePattern := fmt.Sprintf("/boot/%s*-generic", initrdFilename)
-	matches, err := filepath.Glob(initrdClassicFilenamePattern)
-
-	c.Assert(err, check.IsNil, check.Commentf("Error: %v", err))
-
-	return len(matches) == 1
-}
-
 // newKernelFilenamePattern returns the filename pattern to modify files
 // in the partition declared in the boot config file.
 //
@@ -162,15 +145,19 @@
 // If we are not in an update process (ie. we are unsetting the failover conditions)
 // we want to change the files in the other partition
 func newKernelFilenamePattern(c *check.C, bootSystem string, afterUpdate bool) string {
-	var actualPartition string
-	part, err := partition.NextBootPartition()
-	c.Assert(err, check.IsNil, check.Commentf("Error getting the current partition: %s", err))
+	var part string
+	var err error
 	if afterUpdate {
-		actualPartition = part
+		part, err = partition.NextBootPartition()
+		c.Assert(err, check.IsNil,
+			check.Commentf("Error getting the next boot partition: %s", err))
 	} else {
-		actualPartition = partition.OtherPartition(part)
+		part, err = partition.CurrentPartition()
+		c.Assert(err, check.IsNil,
+			check.Commentf("Error getting the current partition: %s", err))
+		part = partition.OtherPartition(part)
 	}
-	return filepath.Join(actualPartition, "%s%s*")
+	return filepath.Join(part, "%s%s*")
 }
 
 /*