Merge lp:~mvo/snappy/lp1480248-test-reenable into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Tiny branch that re-enables the zero-size initrd test. Kudos to Leo for remembering.

[Leo Arias (elopio)]

This needs the bbb oem v1.12 to be released: https://code.launchpad.net/~mvo/snappy-hub/lp1480248-norootwait/+merge/269032

Also, in order to test it we need to fix the arm build in the tests: https://code.launchpad.net/~elopio/snappy/goarm_tests/+merge/269391

[Leo Arias (elopio)]

The test is failing with:

/home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go:248:
    ...open /home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go: no such file or directory
/home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go:143:
    ...open /home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go: no such file or directory
... obtained int = 0
... expected int = 1
... 0 files matching /boot/uboot/a/snappy-selftest-initrd*, 1 expected

For some reason, it's looking for the backed up file in the a boot. /me digs more.

[Leo Arias (elopio)]

The tests needs this change to pass:

http://paste.ubuntu.com/12210111/

There's something weird in there, because the comments of the afterUpdate parameter in the helper function don't seem accurate. I'm making a note to ask Federico about this.

[Michael Vogt (mvo)]

Thanks a lot! This is addressed now.

[lp:~mvo/snappy/lp1480248-test-reenable]

642. By Michael Vogt on 2015-09-01

apply test fix from Leo, many thanks!

[Federico Gimenez (fgimenez)]

With this changes I get an error on kvm: [1]

It seems that the function that determines the kernel filename pattern is wrong for uboot based systems, this patch [2] makes it work for me on both grub and uboot, could you please confirm?

Thanks!

[1] http://paste.ubuntu.com/12251925/
[2] http://paste.ubuntu.com/12251894/

[Federico Gimenez (fgimenez)]

The test should be reenabled now. However because of the latest changes the diff no longer applies, this one works [1]

Thanks,

[1] http://paste.ubuntu.com/12540267/

review: Needs Fixing

[lp:~mvo/snappy/lp1480248-test-reenable]

643. By Michael Vogt on 2015-10-16

merged lp:snappy

[Michael Vogt (mvo)]

Thanks Federico! And sorry for the slow reply. This should be ready again.

[Leo Arias (elopio)]

Test passes. Thank you!

review: Approve

Unmerged revisions

643. By Michael Vogt on 2015-10-16

merged lp:snappy

642. By Michael Vogt on 2015-09-01

apply test fix from Leo, many thanks!

641. By Michael Vogt on 2015-08-26

re-enable TestZeroSizeInitrd on uboot now that lp1480248 is fixed

=== modified file '_integration-tests/tests/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover_zero_size_file_test.go	2015-10-01 09:37:04 +0000
+++ _integration-tests/tests/failover_zero_size_file_test.go	2015-10-16 16:51:20 +0000
@@ -171,13 +171,6 @@
 */
 
 func (s *failoverSuite) TestZeroSizeInitrd(c *check.C) {
-	// Skip if on uboot due to https://bugs.launchpad.net/snappy/+bug/1480248
-	// (fgimenez 20150731)
-	boot, err := partition.BootSystem()
-	c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
-	if boot == "uboot" {
-		c.Skip("Failover for empty initrd not working in uboot")
-	}
 	commonFailoverTest(c, zeroSizeInitrd{})
 }