Merge lp:~sergiusens/snappy/returnErrIfErr into lp:~snappy-dev/snappy/snappy-moved-to-github

[Sergio Schvezov]

Return er if an error occurs during copy in helpers

[Michael Vogt (mvo)]

review: Approve

[lp:~sergiusens/snappy/returnErrIfErr]

546. By Sergio Schvezov on 2015-07-01

Adding broken test

Unmerged revisions

546. By Sergio Schvezov on 2015-07-01

Adding broken test

545. By Sergio Schvezov on 2015-07-01

Return err if err

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-06-09 19:11:54 +0000
+++ helpers/helpers.go	2015-07-01 12:53:02 +0000
@@ -43,6 +43,9 @@
 
 var goarch = runtime.GOARCH
 
+// useful for testing
+var execCommand = exec.Command
+
 func init() {
 	// golang does not init Seed() itself
 	rand.Seed(time.Now().UTC().UnixNano())
@@ -488,9 +491,9 @@
 			// XXX: we should (eventually) use CopyFile here,
 			//      but we need to teach it about preserving
 			//      of atime/mtime and permissions
-			output, err := exec.Command("cp", "-va", src, dst).CombinedOutput()
+			output, err := execCommand("cp", "-va", src, dst).CombinedOutput()
 			if err != nil {
-				fmt.Errorf("Failed to copy %s to %s (%s)", src, dst, output)
+				return fmt.Errorf("Failed to copy %s to %s (%s)", src, dst, output)
 			}
 		}
 		return nil

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-06-09 19:11:54 +0000
+++ helpers/helpers_test.go	2015-07-01 12:53:02 +0000
@@ -32,12 +32,26 @@
 	. "gopkg.in/check.v1"
 )
 
+func fakeExecCommand(command string, args ...string) *exec.Cmd {
+	cs := []string{"-test.run=TestHelperProcess", "--", command}
+	cs = append(cs, args...)
+	cmd := exec.Command(os.Args[0], cs...)
+	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+	return cmd
+}
+
+var TestHelperProcess = func(*testing.T) { panic("mock this") }
+
 func Test(t *testing.T) { TestingT(t) }
 
 type HTestSuite struct{}
 
 var _ = Suite(&HTestSuite{})
 
+func (ts *HTestSuite) TearDownSuite(c *C) {
+	execCommand = exec.Command
+}
+
 func (ts *HTestSuite) TestUnpack(c *C) {
 
 	// setup tmpdir
@@ -445,3 +459,32 @@
 	c.Check(err, NotNil)
 	c.Check(err, ErrorMatches, ".*permission denied.*")
 }
+
+func (ts *HTestSuite) TestSyncCopyFails(c *C) {
+	srcDir := c.MkDir()
+	err := os.MkdirAll(srcDir, 0755)
+	c.Assert(err, IsNil)
+
+	destDir := c.MkDir()
+	err = os.MkdirAll(destDir, 0755)
+	c.Assert(err, IsNil)
+
+	err = ioutil.WriteFile(filepath.Join(srcDir, "meep"), []byte(nil), 0644)
+	c.Assert(err, IsNil)
+
+	// fakeCopy
+	TestHelperProcess = func(t *testing.T) {
+		if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+			return
+		}
+
+		fmt.Fprintf(os.Stderr, "Failed to copy")
+		os.Exit(1)
+	}
+	execCommand = fakeExecCommand
+
+	// do it
+	err = RSyncWithDelete(srcDir, destDir)
+	c.Check(err, NotNil)
+	c.Check(err, ErrorMatches, "Failed to copy.*")
+}