From 1571e9331b4c56cc350bdf339b9aacd72eb3bbbd Mon Sep 17 00:00:00 2001 From: "Paul \"TBBle\" Hampson" Date: Tue, 10 Nov 2020 20:00:48 +1100 Subject: [PATCH] Use specific APIs for shared mount-point behaviour Thanks to @cpuguy83 for pointing these APIs out in #41638. Signed-off-by: Paul "TBBle" Hampson --- integration/container/mounts_linux_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/container/mounts_linux_test.go b/integration/container/mounts_linux_test.go index d65bc99f0d..3c7aabda24 100644 --- a/integration/container/mounts_linux_test.go +++ b/integration/container/mounts_linux_test.go @@ -285,7 +285,7 @@ func TestContainerVolumesMountedAsShared(t *testing.T) { // Convert this directory into a shared mount point so that we do // not rely on propagation properties of parent mount. - if err := mount.Mount(tmpDir1.Path(), tmpDir1.Path(), "none", "bind,private"); err != nil { + if err := mount.MakePrivate(tmpDir1.Path()); err != nil { t.Fatal(err) } defer func() { @@ -293,7 +293,7 @@ func TestContainerVolumesMountedAsShared(t *testing.T) { t.Fatal(err) } }() - if err := mount.Mount("none", tmpDir1.Path(), "none", "shared"); err != nil { + if err := mount.MakeShared(tmpDir1.Path()); err != nil { t.Fatal(err) } @@ -342,7 +342,7 @@ func TestContainerVolumesMountedAsSlave(t *testing.T) { // Convert this directory into a shared mount point so that we do // not rely on propagation properties of parent mount. - if err := mount.Mount(tmpDir1.Path(), tmpDir1.Path(), "none", "bind,private"); err != nil { + if err := mount.MakePrivate(tmpDir1.Path()); err != nil { t.Fatal(err) } defer func() { @@ -350,7 +350,7 @@ func TestContainerVolumesMountedAsSlave(t *testing.T) { t.Fatal(err) } }() - if err := mount.Mount("none", tmpDir1.Path(), "none", "shared"); err != nil { + if err := mount.MakeShared(tmpDir1.Path()); err != nil { t.Fatal(err) }