From e3a6323419c8b2a81a21134ed49a1624eb483c81 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Fri, 29 Dec 2017 13:17:46 -0500 Subject: [PATCH] Cleanup graphdriver/quota test Signed-off-by: Daniel Nephin --- daemon/graphdriver/quota/projectquota_test.go | 43 ++++++++----------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/daemon/graphdriver/quota/projectquota_test.go b/daemon/graphdriver/quota/projectquota_test.go index 2b47a58db7..b5091472f4 100644 --- a/daemon/graphdriver/quota/projectquota_test.go +++ b/daemon/graphdriver/quota/projectquota_test.go @@ -10,6 +10,7 @@ import ( "path/filepath" "testing" + "github.com/gotestyourself/gotestyourself/fs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" @@ -22,7 +23,7 @@ const imageSize = 64 * 1024 * 1024 func TestBlockDev(t *testing.T) { mkfs, err := exec.LookPath("mkfs.xfs") if err != nil { - t.Fatal("mkfs.xfs not installed") + t.Skip("mkfs.xfs not found in PATH") } // create a sparse image @@ -52,18 +53,11 @@ func TestBlockDev(t *testing.T) { t.Fatal(err) } - runTest(t, "testBlockDevQuotaDisabled", wrapMountTest(imageFileName, false, testBlockDevQuotaDisabled)) - runTest(t, "testBlockDevQuotaEnabled", wrapMountTest(imageFileName, true, testBlockDevQuotaEnabled)) - runTest(t, "testSmallerThanQuota", wrapMountTest(imageFileName, true, wrapQuotaTest(testSmallerThanQuota))) - runTest(t, "testBiggerThanQuota", wrapMountTest(imageFileName, true, wrapQuotaTest(testBiggerThanQuota))) - runTest(t, "testRetrieveQuota", wrapMountTest(imageFileName, true, wrapQuotaTest(testRetrieveQuota))) -} - -func runTest(t *testing.T, testName string, testFunc func(*testing.T)) { - if success := t.Run(testName, testFunc); !success { - out, _ := exec.Command("dmesg").CombinedOutput() - t.Log(string(out)) - } + t.Run("testBlockDevQuotaDisabled", wrapMountTest(imageFileName, false, testBlockDevQuotaDisabled)) + t.Run("testBlockDevQuotaEnabled", wrapMountTest(imageFileName, true, testBlockDevQuotaEnabled)) + t.Run("testSmallerThanQuota", wrapMountTest(imageFileName, true, wrapQuotaTest(testSmallerThanQuota))) + t.Run("testBiggerThanQuota", wrapMountTest(imageFileName, true, wrapQuotaTest(testBiggerThanQuota))) + t.Run("testRetrieveQuota", wrapMountTest(imageFileName, true, wrapQuotaTest(testRetrieveQuota))) } func wrapMountTest(imageFileName string, enableQuota bool, testFunc func(t *testing.T, mountPoint, backingFsDev string)) func(*testing.T) { @@ -74,25 +68,22 @@ func wrapMountTest(imageFileName string, enableQuota bool, testFunc func(t *test mountOptions = mountOptions + ",prjquota" } - // create a mountPoint - mountPoint, err := ioutil.TempDir("", "xfs-mountPoint") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(mountPoint) + mountPointDir := fs.NewDir(t, "xfs-mountPoint") + defer mountPointDir.Remove() + mountPoint := mountPointDir.Path() out, err := exec.Command("mount", "-o", mountOptions, imageFileName, mountPoint).CombinedOutput() - if len(out) > 0 { - t.Log(string(out)) - } if err != nil { - t.Fatal("mount failed") + _, err := os.Stat("/proc/fs/xfs") + if os.IsNotExist(err) { + t.Skip("no /proc/fs/xfs") + } } + require.NoError(t, err, "mount failed: %s", out) + defer func() { - if err := unix.Unmount(mountPoint, 0); err != nil { - t.Fatal(err) - } + require.NoError(t, unix.Unmount(mountPoint, 0)) }() backingFsDev, err := makeBackingFsDev(mountPoint)