containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #353 from rhatdan/test1 

Add VFS storage driver testing.
This commit is contained in:
Giuseppe Scrivano 2019-05-22 15:26:48 +02:00 committed by GitHub
parent bbc17904d4 e2746fb152
commit 181b27344b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/cirrus/build.sh
View File

@ -12,19 +12,16 @@ echo "local-test-integration Overlay"
make STORAGE_DRIVER=overlay local-test-integration make STORAGE_DRIVER=overlay local-test-integration
echo "local-test-integration Fuse-overlay" echo "local-test-integration Fuse-overlay"
make STORAGE_DRIVER=overlay STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration 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 case "$OS_REL_VER" in
ubuntu-19) ubuntu-19)
echo "local-test-integration Aufs" echo "local-test-integration Aufs"
make STORAGE_DRIVER=aufs local-test-integration 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 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=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 #make STORAGE_DRIVER=devicemapper STORAGE_OPTION=dm.directlvm_device=/dev/abc local-test-integration

13
drivers/graphtest/graphtest_unix.go
View File

@ -539,5 +539,18 @@ func DriverTestEcho(t testing.TB, drivername string, driverOptions ...string) {
if err = checkChanges(expectedChanges, changes); err != nil { if err = checkChanges(expectedChanges, changes); err != nil {
t.Fatal(err) 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)
}
} }
} }