diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/file.go | 3 | ||||
| -rw-r--r-- | utils/file_backend_test.go | 26 |
2 files changed, 26 insertions, 3 deletions
diff --git a/utils/file.go b/utils/file.go index 13b25bdab..923c559cc 100644 --- a/utils/file.go +++ b/utils/file.go @@ -21,6 +21,9 @@ func CopyFile(src, dst string) (err error) { } defer in.Close() + if err = os.MkdirAll(filepath.Dir(dst), os.ModePerm); err != nil { + return + } out, err := os.Create(dst) if err != nil { return diff --git a/utils/file_backend_test.go b/utils/file_backend_test.go index 098f86bbd..76cd1f4a8 100644 --- a/utils/file_backend_test.go +++ b/utils/file_backend_test.go @@ -51,9 +51,9 @@ func TestS3FileBackendTestSuite(t *testing.T) { suite.Run(t, &FileBackendTestSuite{ settings: model.FileSettings{ DriverName: model.NewString(model.IMAGE_DRIVER_S3), - AmazonS3AccessKeyId: "minioaccesskey", - AmazonS3SecretAccessKey: "miniosecretkey", - AmazonS3Bucket: "mattermost-test", + AmazonS3AccessKeyId: model.MINIO_ACCESS_KEY, + AmazonS3SecretAccessKey: model.MINIO_SECRET_KEY, + AmazonS3Bucket: model.MINIO_BUCKET, AmazonS3Endpoint: s3Endpoint, AmazonS3SSL: model.NewBool(false), }, @@ -106,6 +106,26 @@ func (s *FileBackendTestSuite) TestCopyFile() { s.Nil(err) } +func (s *FileBackendTestSuite) TestCopyFileToDirectoryThatDoesntExist() { + b := []byte("test") + path1 := "tests/" + model.NewId() + path2 := "tests/newdirectory/" + model.NewId() + + err := s.backend.WriteFile(b, path1) + s.Nil(err) + defer s.backend.RemoveFile(path1) + + err = s.backend.CopyFile(path1, path2) + s.Nil(err) + defer s.backend.RemoveFile(path2) + + _, err = s.backend.ReadFile(path1) + s.Nil(err) + + _, err = s.backend.ReadFile(path2) + s.Nil(err) +} + func (s *FileBackendTestSuite) TestMoveFile() { b := []byte("test") path1 := "tests/" + model.NewId() |