github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112803 from pohly/pod-io-rename

Browse Source 
e2e storage: add Rename to PodIO
This commit is contained in:
Kubernetes Prow Robot 2022-09-30 06:28:29 -07:00 committed by GitHub
commit c5ab06f4c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/storage/drivers/csi-test/mock/service/service.go
View File

@ -71,6 +71,9 @@ type DirIO interface {
Mkdir(path string) error Mkdir(path string) error
// RemoveAll removes the path and everything contained inside it. It's not an error if the path does not exist. // RemoveAll removes the path and everything contained inside it. It's not an error if the path does not exist.
RemoveAll(path string) error RemoveAll(path string) error
// Rename changes the name of a file or directory. The parent directory
// of newPath must exist.
Rename(oldPath, newPath string) error
} }
type OSDirIO struct{} type OSDirIO struct{}
@ -97,6 +100,10 @@ func (o OSDirIO) RemoveAll(path string) error {
return os.RemoveAll(path) return os.RemoveAll(path)
} }
func (o OSDirIO) Rename(oldPath, newPath string) error {
return os.Rename(oldPath, newPath)
}
// Service is the CSI Mock service provider. // Service is the CSI Mock service provider.
type Service interface { type Service interface {
csi.ControllerServer csi.ControllerServer

8
test/e2e/storage/drivers/proxy/io.go
View File

@ -70,6 +70,14 @@ func (p PodDirIO) CreateFile(path string, content io.Reader) error {
return nil return nil
} }
func (p PodDirIO) Rename(oldPath, newPath string) error {
_, stderr, err := p.execute([]string{"mv", oldPath, newPath}, nil)
if err != nil {
return fmt.Errorf("rename %q -> %q: stderr=%q, %v", oldPath, newPath, stderr, err)
}
return nil
}
func (p PodDirIO) RemoveAll(path string) error { func (p PodDirIO) RemoveAll(path string) error {
_, stderr, err := p.execute([]string{"rm", "-rf", path}, nil) _, stderr, err := p.execute([]string{"rm", "-rf", path}, nil)
if err != nil { if err != nil {