TrueCloudLab/rclone
16
0
Fork 3
Code Issues 6 Pull requests 1 Projects Releases 1 Packages Wiki Activity Actions

operations: fix TestMkdirModTime test

Browse source 
This was failing on backends that didn't support metadata but did
support setting directory modtimes.
This commit is contained in:
Nick Craig-Wood 2024-03-01 11:18:24 +00:00
parent be39e99918
commit 3bb9394ae5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/operations/operations.go
View file

@ -1015,11 +1015,12 @@ func MkdirMetadata(ctx context.Context, f fs.Fs, dir string, metadata fs.Metadat
// MkdirModTime makes a destination directory or container with modtime // MkdirModTime makes a destination directory or container with modtime
// //
// If the destination Fs doesn't support this it will fall back to // It will try to make the directory with MkdirMetadata and if that
// Mkdir and in this case newDst will be nil. // succeeds it will return a non-nil newDst. In all other cases newDst
// will be nil.
// //
// If the directory was created with MkDir then it will attempt to use // If the directory was created with MkDir then it will attempt to use
// Fs.DirSetModTime if available. // Fs.DirSetModTime to update the directory modtime if available.
func MkdirModTime(ctx context.Context, f fs.Fs, dir string, modTime time.Time) (newDst fs.Directory, err error) { func MkdirModTime(ctx context.Context, f fs.Fs, dir string, modTime time.Time) (newDst fs.Directory, err error) {
logName := fs.LogDirName(f, dir) logName := fs.LogDirName(f, dir)
if SkipDestructive(ctx, logName, "make directory") { if SkipDestructive(ctx, logName, "make directory") {

3
fs/operations/operations_test.go
View file

@ -1680,7 +1680,10 @@ func TestMkdirModTime(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// Check the returned directory and one read from the listing // Check the returned directory and one read from the listing
// newDst may be nil here depending on how the modtime was set
if newDst != nil {
fstest.CheckDirModTime(ctx, t, r.Fremote, newDst, t2) fstest.CheckDirModTime(ctx, t, r.Fremote, newDst, t2)
}
fstest.CheckDirModTime(ctx, t, r.Fremote, fstest.NewDirectory(ctx, t, r.Fremote, name), t2) fstest.CheckDirModTime(ctx, t, r.Fremote, fstest.NewDirectory(ctx, t, r.Fremote, name), t2)
} }