Merge lp:~fgimenez/snappy/extract-mount-functions into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

MakeWritable and MakeReadonly moved from common to partition

MakeWritable and MakeReadonly moved from common to partition

[lp:~fgimenez/snappy/extract-mount-functions]

722. By Federico Gimenez on 2015-10-01

cmd without join

[Leo Arias (elopio)]

nice

review: Approve

[lp:~fgimenez/snappy/extract-mount-functions]

723. By Federico Gimenez on 2015-10-02

merged prerequisite

=== modified file '_integration-tests/tests/failover_rclocal_crash_test.go'
--- _integration-tests/tests/failover_rclocal_crash_test.go	2015-10-02 10:28:33 +0000
+++ _integration-tests/tests/failover_rclocal_crash_test.go	2015-10-02 10:28:33 +0000
@@ -24,6 +24,7 @@
 
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/partition"
 
 	"gopkg.in/check.v1"
 )
@@ -31,8 +32,8 @@
 type rcLocalCrash struct{}
 
 func (rcLocalCrash) set(c *check.C) {
-	common.MakeWritable(c, common.BaseAltPartitionPath)
-	defer common.MakeReadonly(c, common.BaseAltPartitionPath)
+	partition.MakeWritable(c, common.BaseAltPartitionPath)
+	defer partition.MakeReadonly(c, common.BaseAltPartitionPath)
 	targetFile := fmt.Sprintf("%s/etc/rc.local", common.BaseAltPartitionPath)
 	cli.ExecCommand(c, "sudo", "chmod", "a+xw", targetFile)
 
@@ -41,8 +42,8 @@
 }
 
 func (rcLocalCrash) unset(c *check.C) {
-	common.MakeWritable(c, common.BaseAltPartitionPath)
-	defer common.MakeReadonly(c, common.BaseAltPartitionPath)
+	partition.MakeWritable(c, common.BaseAltPartitionPath)
+	defer partition.MakeReadonly(c, common.BaseAltPartitionPath)
 	cli.ExecCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", common.BaseAltPartitionPath))
 }
 

=== modified file '_integration-tests/tests/failover_systemd_loop_test.go'
--- _integration-tests/tests/failover_systemd_loop_test.go	2015-10-02 10:28:33 +0000
+++ _integration-tests/tests/failover_systemd_loop_test.go	2015-10-02 10:28:33 +0000
@@ -24,6 +24,7 @@
 
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/partition"
 
 	"gopkg.in/check.v1"
 )
@@ -72,8 +73,8 @@
 }
 
 func installService(c *check.C, serviceName, serviceCfg, basePath string) {
-	common.MakeWritable(c, basePath)
-	defer common.MakeReadonly(c, basePath)
+	partition.MakeWritable(c, basePath)
+	defer partition.MakeReadonly(c, basePath)
 
 	// Create service file
 	serviceFile := fmt.Sprintf("%s%s/%s.service", basePath, baseSystemdPath, serviceName)
@@ -94,8 +95,8 @@
 }
 
 func unInstallService(c *check.C, serviceName, basePath string) {
-	common.MakeWritable(c, basePath)
-	defer common.MakeReadonly(c, basePath)
+	partition.MakeWritable(c, basePath)
+	defer partition.MakeReadonly(c, basePath)
 
 	// Disable the service
 	cli.ExecCommand(c, "sudo", "chroot", basePath,

=== modified file '_integration-tests/tests/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover_zero_size_file_test.go	2015-10-02 10:28:33 +0000
+++ _integration-tests/tests/failover_zero_size_file_test.go	2015-10-02 10:28:33 +0000
@@ -107,8 +107,8 @@
 	// Only need to make writable and revert for BaseAltPartitionPath,
 	// kernel files' boot directory is writable
 	if basePath == common.BaseAltPartitionPath {
-		common.MakeWritable(c, basePath)
-		defer common.MakeReadonly(c, basePath)
+		partition.MakeWritable(c, basePath)
+		defer partition.MakeReadonly(c, basePath)
 	}
 
 	cli.ExecCommand(c, "sudo", "mv", oldFilename, newFilename)

=== modified file '_integration-tests/testutils/common/common.go'
--- _integration-tests/testutils/common/common.go	2015-10-02 10:28:33 +0000
+++ _integration-tests/testutils/common/common.go	2015-10-02 10:28:33 +0000
@@ -32,6 +32,7 @@
 
 	"launchpad.net/snappy/_integration-tests/testutils/cli"
 	"launchpad.net/snappy/_integration-tests/testutils/config"
+	"launchpad.net/snappy/_integration-tests/testutils/partition"
 )
 
 const (
@@ -127,8 +128,8 @@
 		m[channelCfgOtherBackupFile()] = BaseAltPartitionPath
 		for backup, target := range m {
 			if _, err := os.Stat(backup); err == nil {
-				MakeWritable(c, target)
-				defer MakeReadonly(c, target)
+				partition.MakeWritable(c, target)
+				defer partition.MakeReadonly(c, target)
 				original := filepath.Join(target, channelCfgFile)
 				c.Logf("Restoring %s...", original)
 				cli.ExecCommand(c, "sudo", "mv", backup, original)
@@ -153,8 +154,8 @@
 	for _, target := range targets {
 		file := filepath.Join(target, channelCfgFile)
 		if _, err := os.Stat(file); err == nil {
-			MakeWritable(c, target)
-			defer MakeReadonly(c, target)
+			partition.MakeWritable(c, target)
+			defer partition.MakeReadonly(c, target)
 			replaceSystemImageValues(c, file, release, channel, version)
 		}
 	}
@@ -228,8 +229,8 @@
 	for target, backup := range m {
 		file := filepath.Join(target, channelCfgFile)
 		if _, err := os.Stat(file); err == nil {
-			MakeWritable(c, target)
-			defer MakeReadonly(c, target)
+			partition.MakeWritable(c, target)
+			defer partition.MakeReadonly(c, target)
 			// Back up the file. It will be restored during the test tear down.
 			cli.ExecCommand(c, "cp", file, backup)
 			replaceSystemImageValues(c, file, "", "", strconv.Itoa(newVersion))
@@ -237,16 +238,6 @@
 	}
 }
 
-// MakeWritable remounts a path with read and write permissions.
-func MakeWritable(c *check.C, path string) {
-	cli.ExecCommand(c, "sudo", "mount", "-o", "remount,rw", path)
-}
-
-// MakeReadonly remounts a path with only read permissions.
-func MakeReadonly(c *check.C, path string) {
-	cli.ExecCommand(c, "sudo", "mount", "-o", "remount,ro", path)
-}
-
 // Reboot requests a reboot using the test name as the mark.
 func Reboot(c *check.C) {
 	RebootWithMark(c, c.TestName())

=== added file '_integration-tests/testutils/partition/partition.go'
--- _integration-tests/testutils/partition/partition.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/partition/partition.go	2015-10-02 10:28:33 +0000
@@ -0,0 +1,38 @@
+// -*- 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 partition
+
+import (
+	"gopkg.in/check.v1"
+
+	"launchpad.net/snappy/_integration-tests/testutils/cli"
+)
+
+var execCommand = cli.ExecCommand
+
+// 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)
+}

=== added file '_integration-tests/testutils/partition/partition_test.go'
--- _integration-tests/testutils/partition/partition_test.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/testutils/partition/partition_test.go	2015-10-02 10:28:33 +0000
@@ -0,0 +1,69 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-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 partition
+
+import (
+	"strings"
+
+	"gopkg.in/check.v1"
+)
+
+const path = "mypath"
+
+type partitionTestSuite struct {
+	execCalls       map[string]int
+	backExecCommand func(*check.C, ...string) string
+}
+
+var _ = check.Suite(&partitionTestSuite{})
+
+func (s *partitionTestSuite) SetUpSuite(c *check.C) {
+	s.backExecCommand = execCommand
+	execCommand = s.fakeExecCommand
+}
+
+func (s *partitionTestSuite) TearDownSuite(c *check.C) {
+	execCommand = s.backExecCommand
+}
+
+func (s *partitionTestSuite) SetUpTest(c *check.C) {
+	s.execCalls = make(map[string]int)
+}
+
+func (s *partitionTestSuite) fakeExecCommand(c *check.C, args ...string) (output string) {
+	s.execCalls[strings.Join(args, " ")]++
+	return
+}
+
+func (s *partitionTestSuite) TestMakeWritable(c *check.C) {
+	cmd := "sudo mount -o remount,rw " + path
+
+	MakeWritable(c, path)
+
+	c.Assert(s.execCalls[cmd], check.Equals, 1)
+}
+
+func (s *partitionTestSuite) TestMakeReadOnly(c *check.C) {
+	cmd := "sudo mount -o remount,ro " + path
+
+	MakeReadonly(c, path)
+
+	c.Assert(s.execCalls[cmd], check.Equals, 1)
+}