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

graphtest: expect 0555 permissions 

When testing graph drivers, update the expected permission on the root
directory of an empty layer to reflect changes made to the overlay
driver.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2021-02-23 18:17:49 -05:00
parent 8807739467
commit 4ccbebd656
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/graphtest/graphtest_unix.go
View File

@ -28,6 +28,11 @@ var (
drv *Driver
)
const (
defaultPerms = os.FileMode(0555)
modifiedPerms = os.FileMode(0711)
)
// Driver conforms to graphdriver.Driver interface and
// contains information such as root and reference count of the number of clients using it.
// This helps in testing drivers added into the framework.
@ -106,7 +111,7 @@ func DriverTestCreateEmpty(t testing.TB, drivername string, driverOptions ...str
dir, err := driver.Get("empty", graphdriver.MountOpts{})
require.NoError(t, err)
verifyFile(t, dir, 0755|os.ModeDir, 0, 0)
verifyFile(t, dir, defaultPerms|os.ModeDir, 0, 0)
// Verify that the directory is empty
fis, err := readDir(dir)
@ -125,7 +130,7 @@ func DriverTestCreateBase(t testing.TB, drivername string, driverOptions ...stri
defer func() {
require.NoError(t, driver.Remove("Base"))
}()
verifyBase(t, driver, "Base")
verifyBase(t, driver, "Base", defaultPerms)
}
// DriverTestCreateSnap Create a driver and snap and verify.
@ -144,7 +149,21 @@ func DriverTestCreateSnap(t testing.TB, drivername string, driverOptions ...stri
require.NoError(t, driver.Remove("Snap"))
}()
verifyBase(t, driver, "Snap")
verifyBase(t, driver, "Snap", defaultPerms)
root, err := driver.Get("Snap", graphdriver.MountOpts{})
assert.NoError(t, err)
err = os.Chmod(root, modifiedPerms)
require.NoError(t, err)
driver.Put("Snap")
err = driver.Create("SecondSnap", "Snap", nil)
require.NoError(t, err)
defer func() {
require.NoError(t, driver.Remove("SecondSnap"))
}()
verifyBase(t, driver, "SecondSnap", modifiedPerms)
}
// DriverTestCreateFromTemplate Create a driver and template of a snap and verifies its
@ -238,7 +257,7 @@ func DriverTestCreateFromTemplate(t testing.TB, drivername string, driverOptions
t.Fatal(err)
}
verifyBase(t, driver, "Base")
verifyBase(t, driver, "Base", defaultPerms)
}
// DriverTestDeepLayerRead reads a file from a lower layer under a given number of layers

4
drivers/graphtest/testutil_unix.go
View File

@ -53,11 +53,13 @@ func createBase(t testing.TB, driver graphdriver.Driver, name string) {
require.NoError(t, err)
}
func verifyBase(t testing.TB, driver graphdriver.Driver, name string) {
func verifyBase(t testing.TB, driver graphdriver.Driver, name string, defaultPerm os.FileMode) {
dir, err := driver.Get(name, graphdriver.MountOpts{})
require.NoError(t, err)
defer driver.Put(name)
verifyFile(t, dir, defaultPerm|os.ModeDir, 0, 0)
subdir := path.Join(dir, "a subdir")
verifyFile(t, subdir, 0705|os.ModeDir|os.ModeSticky, 1, 2)