beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46847 from thaJeztah/uncontainerise_TestDaemonNoSpaceLeftOnDeviceError

Browse source 
un-containerize TestDaemonNoSpaceLeftOnDeviceError
This commit is contained in:
Sebastiaan van Stijn 2023-12-07 20:02:29 +01:00 committed by GitHub
commit 294274e10e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
integration-cli/docker_cli_daemon_test.go
View file

@ -1646,16 +1646,15 @@ func (s *DockerDaemonSuite) TestDaemonNoSpaceLeftOnDeviceError(c *testing.T) {
assert.Assert(c, mount.MakeRShared(testDir) == nil)
defer mount.Unmount(testDir)
// create a 3MiB image (with a 2MiB ext4 fs) and mount it as graph root
//
// Why in a container? Because `mount` sometimes behaves weirdly and often
// fails outright on this test in debian:jessie (which is what the test suite
// runs under if run from the Makefile at the time this patch was added).
cli.DockerCmd(c, "run", "--rm", "-v", testDir+":/test", "busybox", "sh", "-c", "dd of=/test/testfs.img bs=1M seek=3 count=0")
icmd.RunCommand("mkfs.ext4", "-F", filepath.Join(testDir, "testfs.img")).Assert(c, icmd.Success)
// create a 3MiB image (with a 2MiB ext4 fs) and mount it as storage root
storageFS := filepath.Join(testDir, "testfs.img")
icmd.RunCommand("dd", "of="+storageFS, "bs=1M", "seek=3", "count=0").Assert(c, icmd.Success)
icmd.RunCommand("mkfs.ext4", "-F", storageFS).Assert(c, icmd.Success)
cli.DockerCmd(c, "run", "--privileged", "--rm", "-v", testDir+":/test:shared", "busybox", "sh", "-c", "mkdir -p /test/test-mount && mount -n -t ext4 /test/testfs.img /test/test-mount")
defer mount.Unmount(filepath.Join(testDir, "test-mount"))
testMount, err := os.MkdirTemp(testDir, "test-mount")
assert.NilError(c, err)
icmd.RunCommand("mount", "-n", "-t", "ext4", storageFS, testMount).Assert(c, icmd.Success)
defer mount.Unmount(testMount)
driver := "vfs"
if testEnv.UsingSnapshotter() {
@ -1663,11 +1662,11 @@ func (s *DockerDaemonSuite) TestDaemonNoSpaceLeftOnDeviceError(c *testing.T) {
}
s.d.Start(c,
"--data-root", filepath.Join(testDir, "test-mount"),
"--data-root", testMount,
"--storage-driver", driver,
// Pass empty containerd socket to force daemon to create a new
// supervised containerd daemon. Otherwise the global containerd daemon
// supervised containerd daemon, otherwise the global containerd daemon
// will be used and its data won't be stored in the specified data-root.
"--containerd", "",
)