diff options
author | Andrei Vagin <avagin@google.com> | 2019-01-31 15:17:50 -0800 |
---|---|---|
committer | Shentubot <shentubot@google.com> | 2019-01-31 15:19:04 -0800 |
commit | 4e695adcd0c739101c3d50431ca18b1b911c9238 (patch) | |
tree | 2eb6bd3696011463e521adea2da10978dde59a95 /runsc/test | |
parent | 88b4ce8cac9c438da472205e0e710dd75e73b050 (diff) |
gvisor/gofer: Use pivot_root instead of chroot
PiperOrigin-RevId: 231864273
Change-Id: I8545b72b615f5c2945df374b801b80be64ec3e13
Diffstat (limited to 'runsc/test')
-rw-r--r-- | runsc/test/root/chroot_test.go | 5 | ||||
-rw-r--r-- | runsc/test/testutil/docker.go | 9 |
2 files changed, 1 insertions, 13 deletions
diff --git a/runsc/test/root/chroot_test.go b/runsc/test/root/chroot_test.go index 89f90c3e0..0deca0532 100644 --- a/runsc/test/root/chroot_test.go +++ b/runsc/test/root/chroot_test.go @@ -118,10 +118,7 @@ func TestChrootGofer(t *testing.T) { // This where the root directory is mapped on the host and that's where the // gofer must have chroot'd to. - root, err := d.RootDirInHost() - if err != nil { - t.Fatalf("Docker.RootDirInHost(): %v", err) - } + root := "/root" for _, child := range children { childPID, err := strconv.Atoi(child) diff --git a/runsc/test/testutil/docker.go b/runsc/test/testutil/docker.go index 9a76397be..5a92a5835 100644 --- a/runsc/test/testutil/docker.go +++ b/runsc/test/testutil/docker.go @@ -297,15 +297,6 @@ func (d *Docker) SandboxPid() (int, error) { return pid, nil } -// RootDirInHost returns where the root directory is mapped on the host. -func (d *Docker) RootDirInHost() (string, error) { - out, err := do("inspect", "-f={{.GraphDriver.Data.MergedDir}}", d.Name) - if err != nil { - return "", fmt.Errorf("error retrieving pid: %v", err) - } - return strings.TrimSuffix(string(out), "\n"), nil -} - // ID returns the container ID. func (d *Docker) ID() (string, error) { out, err := do("inspect", "-f={{.Id}}", d.Name) |