rebase

fairDataSociety · Dec 13, 2021 · e0ea0a3 · e0ea0a3
1 parent d6dbbc6
commit e0ea0a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 63 deletions.
diff --git a/pkg/dfs/pod_api.go b/pkg/dfs/pod_api.go
@@ -94,7 +94,6 @@ func (d *DfsAPI) DeletePod(podName, passphrase, sessionId string) error {
 	if err != nil {
 		return err
 	}
-	directory := podInfo.GetDirectory()
 
 	// delete the pod and close if it is opened
 	err = ui.GetPod().DeleteOwnPod(podName)

diff --git a/pkg/dir/rmdir_test.go b/pkg/dir/rmdir_test.go
@@ -196,60 +196,6 @@ func TestRmRootDir(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		// verify if the directory is actually removed
-		dirEntry, _, err = dirObject.ListDir("/")
-		if !strings.HasSuffix(err.Error(), dir.ErrResourceDeleted.Error()) {
-			t.Fatal("root directory was not deleted")
-		}
-		if dirEntry != nil {
-			t.Fatalf("could not delete directory")
-		}
-	})
-
-		// make root dir so that other directories can be added
-		err = dirObject.MkRootDir("pod1", user, fd)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// create a new dir
-		err := dirObject.MkDir("/dirToRemove1")
-		if err != nil {
-			t.Fatal(err)
-		}
-		// create a new dir
-		err = dirObject.MkDir("/dirToRemove1/dirToRemove2")
-		if err != nil {
-			t.Fatal(err)
-		}
-		// create a new dir
-		err = dirObject.MkDir("/dirToRemove1/dirToRemove2/dirToRemove")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// make sure directories were created
-		dirEntry, _, err := dirObject.ListDir("/dirToRemove1")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if dirEntry == nil {
-			t.Fatal("nested directory \"/dirToRemove1/dirToRemove2\" was not created")
-		}
-		dirEntry, _, err = dirObject.ListDir("/dirToRemove1/dirToRemove2")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if dirEntry == nil {
-			t.Fatal("nested directory \"/dirToRemove1/dirToRemove2/dirToRemove\" was not created")
-		}
-
-		// now delete the root directory
-		err = dirObject.RmRootDir()
-		if err != nil {
-			t.Fatal(err)
-		}
-
 		// verify if the directory is actually removed
 		dirEntry, _, err = dirObject.ListDir("/")
 		if !strings.HasSuffix(err.Error(), dir.ErrResourceDeleted.Error()) {

diff --git a/pkg/file/mock/mock_file.go b/pkg/file/mock/mock_file.go
@@ -29,34 +29,34 @@ func NewMockFile() *MockFile {
 	return &MockFile{}
 }
 
-func (*MockFile) Upload(fd io.Reader, podFileName string, fileSize int64, blockSize uint32, podPath, compression string) error {
+func (*MockFile) Upload(_ io.Reader, _ string, _ int64, _ uint32, _, _ string) error {
 	return nil
 }
 
-func (*MockFile) Download(podFileWithPath string) (io.ReadCloser, uint64, error) {
+func (*MockFile) Download(_ string) (io.ReadCloser, uint64, error) {
 	return nil, 0, nil
 }
 
-func (*MockFile) ListFiles(files []string) ([]file.Entry, error) {
+func (*MockFile) ListFiles(_ []string) ([]file.Entry, error) {
 	return nil, nil
 }
 
-func (*MockFile) GetStats(podName, podFileWithPath string) (*file.Stats, error) {
+func (*MockFile) GetStats(_, _ string) (*file.Stats, error) {
 	return nil, nil
 }
 
-func (*MockFile) RmFile(podFileWithPath string) error {
+func (*MockFile) RmFile(_ string) error {
 	return nil
 }
 
-func (*MockFile) Read(b []byte) (n int, err error) {
+func (*MockFile) Read(_ []byte) (n int, err error) {
 	return 0, nil
 }
 
-func (*MockFile) AddFileToPath(filePath, metaHexRef string) error {
+func (*MockFile) AddFileToPath(_, _ string) error {
 	return nil
 }
 
-func (*MockFile) LoadFileMeta(fileNameWithPath string) error {
+func (*MockFile) LoadFileMeta(_ string) error {
 	return nil
 }