mirror of
https://github.com/docker/cli.git
synced 2026-01-16 20:22:36 +03:00
filesystem tests: Added a newTestFilesystem help function to remove
duplicate code Upstream-commit: 06d8f7ce63d54d117a8245ccdbd84cfc90dfdd6b Component: engine
This commit is contained in:
@@ -8,18 +8,21 @@ import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFilesystem(t *testing.T) {
|
||||
func newTestFilesystem(t *testing.T, layers []string) (rootfs string, rwpath string, fs *Filesystem) {
|
||||
rootfs, err := ioutil.TempDir("", "docker-test-root")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
rwpath, err := ioutil.TempDir("", "docker-test-rw")
|
||||
rwpath, err = ioutil.TempDir("", "docker-test-rw")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
fs = newFilesystem(rootfs, rwpath, layers)
|
||||
return
|
||||
}
|
||||
|
||||
filesystem := newFilesystem(rootfs, rwpath, []string{"/var/lib/docker/images/ubuntu"})
|
||||
|
||||
func TestFilesystem(t *testing.T) {
|
||||
_, _, filesystem := newTestFilesystem(t, []string{"/var/lib/docker/images/ubuntu"})
|
||||
if err := filesystem.Umount(); err == nil {
|
||||
t.Errorf("Umount succeeded even though the filesystem was not mounted")
|
||||
}
|
||||
@@ -53,15 +56,7 @@ func TestFilesystemMultiLayer(t *testing.T) {
|
||||
}
|
||||
|
||||
// Create the layered filesystem and add our fake layer on top
|
||||
rootfs, err := ioutil.TempDir("", "docker-test-root")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
rwpath, err := ioutil.TempDir("", "docker-test-rw")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
filesystem := newFilesystem(rootfs, rwpath, []string{"/var/lib/docker/images/ubuntu", fakeLayer})
|
||||
rootfs, _, filesystem := newTestFilesystem(t, []string{"/var/lib/docker/images/ubuntu", fakeLayer})
|
||||
|
||||
// Mount it
|
||||
if err := filesystem.Mount(); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user