From b0f0361251f814e52658d51f7fe96b9651703f7b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 21 May 2019 15:00:16 -0400 Subject: [PATCH 1/2] Cleanup hang on unit tests Currently unit tests seem to be hanging Signed-off-by: Daniel J Walsh --- contrib/cirrus/build.sh | 8 ++------ drivers/graphtest/graphtest_unix.go | 13 +++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/cirrus/build.sh b/contrib/cirrus/build.sh index e34f3d993..68f67fa77 100755 --- a/contrib/cirrus/build.sh +++ b/contrib/cirrus/build.sh @@ -12,17 +12,13 @@ echo "local-test-integration Overlay" make STORAGE_DRIVER=overlay local-test-integration echo "local-test-integration Fuse-overlay" make STORAGE_DRIVER=overlay STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration +echo "local-test-unit" +make local-test-unit case "$OS_REL_VER" in ubuntu-19) echo "local-test-integration Aufs" make STORAGE_DRIVER=aufs local-test-integration - echo "local-test-unit" - make local-test-unit - ;; - fedora-30) - echo "local-test-unit" - make local-test-unit ;; esac #make STORAGE_DRIVER=vfs local-test-integration diff --git a/drivers/graphtest/graphtest_unix.go b/drivers/graphtest/graphtest_unix.go index 3eb6483fe..ee9b3a894 100644 --- a/drivers/graphtest/graphtest_unix.go +++ b/drivers/graphtest/graphtest_unix.go @@ -539,5 +539,18 @@ func DriverTestEcho(t testing.TB, drivername string, driverOptions ...string) { if err = checkChanges(expectedChanges, changes); err != nil { t.Fatal(err) } + + err = driver.Put(third) + if err != nil { + t.Fatal(err) + } + err = driver.Put(second) + if err != nil { + t.Fatal(err) + } + err = driver.Put(base) + if err != nil { + t.Fatal(err) + } } } From e2746fb15221270c3a376f3344ab3556f8f243d6 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 22 May 2019 04:27:35 -0400 Subject: [PATCH 2/2] Turn on vfs testing Signed-off-by: Daniel J Walsh --- contrib/cirrus/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/cirrus/build.sh b/contrib/cirrus/build.sh index 68f67fa77..b684f8b64 100755 --- a/contrib/cirrus/build.sh +++ b/contrib/cirrus/build.sh @@ -13,6 +13,8 @@ make STORAGE_DRIVER=overlay local-test-integration echo "local-test-integration Fuse-overlay" make STORAGE_DRIVER=overlay STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration echo "local-test-unit" +make STORAGE_DRIVER=vfs local-test-integration +echo "local-test-unit" make local-test-unit case "$OS_REL_VER" in @@ -21,6 +23,5 @@ case "$OS_REL_VER" in make STORAGE_DRIVER=aufs local-test-integration ;; esac -#make STORAGE_DRIVER=vfs local-test-integration #make STORAGE_DRIVER=overlay FUSE_OVERLAYFS_DISABLE_OVL_WHITEOUT=1 STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration #make STORAGE_DRIVER=devicemapper STORAGE_OPTION=dm.directlvm_device=/dev/abc local-test-integration