update vendor

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>

vendor/github.com/containerd/continuity/testutil/helpers.go

@@ -0,0 +1,11 @@
+package testutil
+
+import (
+	"flag"
+)
+
+var rootEnabled bool
+
+func init() {
+	flag.BoolVar(&rootEnabled, "test.root", false, "enable tests that require root")
+}

vendor/github.com/containerd/continuity/testutil/helpers_unix.go

@@ -0,0 +1,41 @@
+// +build !windows
+
+package testutil
+
+import (
+	"os"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+// Unmount unmounts a given mountPoint and sets t.Error if it fails
+func Unmount(t *testing.T, mountPoint string) {
+	t.Log("unmount", mountPoint)
+	if err := unmountAll(mountPoint); err != nil {
+		t.Error("Could not umount", mountPoint, err)
+	}
+}
+
+// RequiresRoot skips tests that require root, unless the test.root flag has
+// been set
+func RequiresRoot(t testing.TB) {
+	if !rootEnabled {
+		t.Skip("skipping test that requires root")
+		return
+	}
+	if os.Getuid() != 0 {
+		t.Error("This test must be run as root.")
+	}
+}
+
+func unmountAll(mountpoint string) error {
+	for {
+		if err := unix.Unmount(mountpoint, unmountFlags); err != nil {
+			if err == unix.EINVAL {
+				return nil
+			}
+			return err
+		}
+	}
+}

vendor/github.com/containerd/continuity/testutil/helpers_windows.go

@@ -0,0 +1,16 @@
+package testutil
+
+import "testing"
+
+// RequiresRoot does nothing on Windows
+func RequiresRoot(t testing.TB) {
+}
+
+// RequiresRootM is similar to RequiresRoot but intended to be called from *testing.M.
+func RequiresRootM() {
+}
+
+// Unmount unmounts a given mountPoint and sets t.Error if it fails
+// Does nothing on Windows
+func Unmount(t *testing.T, mountPoint string) {
+}

vendor/github.com/containerd/continuity/testutil/loopback_linux.go

@@ -0,0 +1,53 @@
+// +build linux
+
+package testutil
+
+import (
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"strings"
+
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+)
+
+// NewLoopback creates a loopback device, and returns its device name (/dev/loopX), and its clean-up function.
+func NewLoopback(size int64) (string, func() error, error) {
+	// create temporary file for the disk image
+	file, err := ioutil.TempFile("", "containerd-test-loopback")
+	if err != nil {
+		return "", nil, errors.Wrap(err, "could not create temporary file for loopback")
+	}
+
+	if err := file.Truncate(size); err != nil {
+		return "", nil, errors.Wrap(err, "failed to resize temp file")
+	}
+	file.Close()
+
+	// create device
+	losetup := exec.Command("losetup", "--find", "--show", file.Name())
+	p, err := losetup.Output()
+	if err != nil {
+		return "", nil, errors.Wrap(err, "loopback setup failed")
+	}
+
+	deviceName := strings.TrimSpace(string(p))
+	logrus.Debugf("Created loop device %s (using %s)", deviceName, file.Name())
+
+	cleanup := func() error {
+		// detach device
+		logrus.Debugf("Removing loop device %s", deviceName)
+		losetup := exec.Command("losetup", "--detach", deviceName)
+		err := losetup.Run()
+		if err != nil {
+			return errors.Wrapf(err, "Could not remove loop device %s", deviceName)
+		}
+
+		// remove file
+		logrus.Debugf("Removing temporary file %s", file.Name())
+		return os.Remove(file.Name())
+	}
+
+	return deviceName, cleanup, nil
+}

vendor/github.com/containerd/continuity/testutil/mount_linux.go

@@ -0,0 +1,5 @@
+package testutil
+
+import "golang.org/x/sys/unix"
+
+const unmountFlags int = unix.MNT_DETACH

vendor/github.com/containerd/continuity/testutil/mount_other.go

@@ -0,0 +1,5 @@
+// +build !linux,!windows
+
+package testutil
+
+const unmountFlags int = 0