mirror of
https://github.com/minio/minio.git
synced 2025-01-12 23:43:22 -05:00
tests: posix: tests cleaning up and enhancing coverage. (#2410)
This commit is contained in:
parent
fe62688683
commit
0b225269e1
71
posix.go
71
posix.go
@ -152,40 +152,6 @@ func checkDiskFree(diskPath string, minFreeDisk int64) (err error) {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// List all the volumes from diskPath.
|
|
||||||
func listVols(dirPath string) ([]VolInfo, error) {
|
|
||||||
if err := checkPathLength(dirPath); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
entries, err := readDir(dirPath)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errDiskNotFound
|
|
||||||
}
|
|
||||||
var volsInfo []VolInfo
|
|
||||||
for _, entry := range entries {
|
|
||||||
if !strings.HasSuffix(entry, slashSeparator) || !isValidVolname(slashpath.Clean(entry)) {
|
|
||||||
// Skip if entry is neither a directory not a valid volume name.
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
var fi os.FileInfo
|
|
||||||
fi, err = os.Stat(preparePath(pathJoin(dirPath, entry)))
|
|
||||||
if err != nil {
|
|
||||||
// If the file does not exist, skip the entry.
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
volsInfo = append(volsInfo, VolInfo{
|
|
||||||
Name: fi.Name(),
|
|
||||||
// As os.Stat() doesn't carry other than ModTime(), use
|
|
||||||
// ModTime() as CreatedTime.
|
|
||||||
Created: fi.ModTime(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return volsInfo, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// getVolDir - will convert incoming volume names to
|
// getVolDir - will convert incoming volume names to
|
||||||
// corresponding valid volume names on the backend in a platform
|
// corresponding valid volume names on the backend in a platform
|
||||||
// compatible way for all operating systems. If volume is not found
|
// compatible way for all operating systems. If volume is not found
|
||||||
@ -194,9 +160,6 @@ func (s *posix) getVolDir(volume string) (string, error) {
|
|||||||
if !isValidVolname(volume) {
|
if !isValidVolname(volume) {
|
||||||
return "", errInvalidArgument
|
return "", errInvalidArgument
|
||||||
}
|
}
|
||||||
if err := checkPathLength(volume); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
volumeDir := pathJoin(s.diskPath, volume)
|
volumeDir := pathJoin(s.diskPath, volume)
|
||||||
return volumeDir, nil
|
return volumeDir, nil
|
||||||
}
|
}
|
||||||
@ -262,6 +225,40 @@ func (s *posix) ListVols() (volsInfo []VolInfo, err error) {
|
|||||||
return volsInfo, nil
|
return volsInfo, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// List all the volumes from diskPath.
|
||||||
|
func listVols(dirPath string) ([]VolInfo, error) {
|
||||||
|
if err := checkPathLength(dirPath); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
entries, err := readDir(dirPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errDiskNotFound
|
||||||
|
}
|
||||||
|
var volsInfo []VolInfo
|
||||||
|
for _, entry := range entries {
|
||||||
|
if !strings.HasSuffix(entry, slashSeparator) || !isValidVolname(slashpath.Clean(entry)) {
|
||||||
|
// Skip if entry is neither a directory not a valid volume name.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var fi os.FileInfo
|
||||||
|
fi, err = os.Stat(preparePath(pathJoin(dirPath, entry)))
|
||||||
|
if err != nil {
|
||||||
|
// If the file does not exist, skip the entry.
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
volsInfo = append(volsInfo, VolInfo{
|
||||||
|
Name: fi.Name(),
|
||||||
|
// As os.Stat() doesn't carry other than ModTime(), use
|
||||||
|
// ModTime() as CreatedTime.
|
||||||
|
Created: fi.ModTime(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return volsInfo, nil
|
||||||
|
}
|
||||||
|
|
||||||
// StatVol - get volume info.
|
// StatVol - get volume info.
|
||||||
func (s *posix) StatVol(volume string) (volInfo VolInfo, err error) {
|
func (s *posix) StatVol(volume string) (volInfo VolInfo, err error) {
|
||||||
defer func() {
|
defer func() {
|
||||||
|
966
posix_test.go
966
posix_test.go
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user