cipd: accept a function in EnsureFile

client/cipd/local/fs_test.go

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package local
 
 import (
         "io/ioutil"
         "os"
         "path/filepath"
@@ skipping 104 matching lines @@
                 fs := tempFileSystem()
                 fs.write("a/b/c", "something")
                 So(fs.EnsureSymlink(fs.join("a"), "target"), ShouldBeNil)
                 So(fs.readLink("a"), ShouldEqual, "target")
         })
 }
 
 func TestEnsureFile(t *testing.T) {
         Convey("EnsureFile checks root", t, func() {
                 fs := tempFileSystem()
-                So(fs.EnsureFile(fs.join(".."), strings.NewReader("blah")), ShouldNotBeNil)
+                So(EnsureFile(fs, fs.join(".."), strings.NewReader("blah")), ShouldNotBeNil)
         })
 
         Convey("EnsureFile creates new file", t, func() {
                 fs := tempFileSystem()
-                So(fs.EnsureFile(fs.join("name"), strings.NewReader("blah")), ShouldBeNil)
+                So(EnsureFile(fs, fs.join("name"), strings.NewReader("blah")), ShouldBeNil)
                 So(fs.read("name"), ShouldEqual, "blah")
         })
 
         Convey("EnsureFile builds full path", t, func() {
                 fs := tempFileSystem()
-                So(fs.EnsureFile(fs.join("a/b/c"), strings.NewReader("blah")), ShouldBeNil)
+                So(EnsureFile(fs, fs.join("a/b/c"), strings.NewReader("blah")), ShouldBeNil)
                 So(fs.read("a/b/c"), ShouldEqual, "blah")
         })
 
         if runtime.GOOS != "windows" {
                 Convey("EnsureFile replaces existing symlink", t, func() {
                         fs := tempFileSystem()
                         So(fs.EnsureSymlink(fs.join("path"), "target"), ShouldBeNil)
-                        So(fs.EnsureFile(fs.join("path"), strings.NewReader("blah")), ShouldBeNil)
+                        So(EnsureFile(fs, fs.join("path"), strings.NewReader("blah")), ShouldBeNil)
                         So(fs.read("path"), ShouldEqual, "blah")
                 })
         }
 
         Convey("EnsureFile replaces existing file", t, func() {
                 fs := tempFileSystem()
-                So(fs.EnsureFile(fs.join("path"), strings.NewReader("huh")), ShouldBeNil)
-                So(fs.EnsureFile(fs.join("path"), strings.NewReader("blah")), ShouldBeNil)
+                So(EnsureFile(fs, fs.join("path"), strings.NewReader("huh")), ShouldBeNil)
+                So(EnsureFile(fs, fs.join("path"), strings.NewReader("blah")), ShouldBeNil)
                 So(fs.read("path"), ShouldEqual, "blah")
         })
 
         Convey("EnsureFile replaces existing directory", t, func() {
                 fs := tempFileSystem()
                 fs.write("a/b/c", "something")
-                So(fs.EnsureFile(fs.join("a"), strings.NewReader("blah")), ShouldBeNil)
+                So(EnsureFile(fs, fs.join("a"), strings.NewReader("blah")), ShouldBeNil)
                 So(fs.read("a"), ShouldEqual, "blah")
         })
 }
 
 func TestEnsureFileGone(t *testing.T) {
         Convey("EnsureFileGone checks root", t, func() {
                 fs := tempFileSystem()
                 So(fs.EnsureFileGone(fs.join("../abc")), ShouldNotBeNil)
         })
 
@@ skipping 187 matching lines @@
 
 // isFile returns true if a file at a given slash separated path relative to
 // Root() is a file (not a directory).
 func (f *tempFileSystemImpl) isFile(rel string) bool {
         stat, err := os.Stat(f.join(rel))
         if err != nil {
                 return false
         }
         return !stat.IsDir()
 }