From 06d8f7ce63d54d117a8245ccdbd84cfc90dfdd6b Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Wed, 23 Jan 2013 17:18:07 -0800 Subject: [PATCH] filesystem tests: Added a newTestFilesystem help function to remove duplicate code --- filesystem_test.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/filesystem_test.go b/filesystem_test.go index 9c3dd5cff0..7bf9514dc3 100644 --- a/filesystem_test.go +++ b/filesystem_test.go @@ -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 {