Merge lp:~fgimenez/snappy/fix-zerosize-systemd-failover-test into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

zero size systemd of new partition made executable to prevent unrecoverable boot failure

Beginning with image #98, the failoverSuite.TestZeroSizeSystemd test was failing on reboot after setting the /lib/systemd/systemd file to empty with this message:

  target filesystem doesn’t have requested /lib/systemd/systemd
  /bin/sh: 0: can’t access tty; job control turned off

The changes in this branch make the empty systemd file executable, which lets the system detect the panic and reboot to the previous partition.

[lp:~fgimenez/snappy/fix-zerosize-systemd-failover-test]

562. By Federico Gimenez on 2015-07-06

Always copy the original FileMode on file renaming

563. By Federico Gimenez on 2015-07-06

Checked Stat error while getting info of renamed file

[Leo Arias (elopio)]

Please, file the bug as discussed during the meeting.

review: Approve (tested)

=== 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 12:50:51 +0000
@@ -21,6 +21,7 @@
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -95,9 +96,19 @@
 	makeWritable(c, basePath)
 	ExecCommand(c, "sudo", "mv", oldFilename, newFilename)
 	ExecCommand(c, "sudo", "touch", oldFilename)
+
+	mode := getFileMode(c, newFilename)
+	ExecCommand(c, "sudo", "chmod", fmt.Sprintf("%o", mode), oldFilename)
 	makeReadonly(c, basePath)
 }
 
+func getFileMode(c *C, filePath string) os.FileMode {
+	info, err := os.Stat(filePath)
+	c.Check(err, IsNil, Commentf("Error getting Stat of %s", filePath))
+
+	return info.Mode()
+}
+
 func getSingleFilename(c *C, pattern string) string {
 	matches, err := filepath.Glob(pattern)