extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-07 17:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fstests: fixes the integration test errors running crypt over swift.

Browse Source 
Skip tests involving errors creating or removing dirs on non root
bucket based fs
This commit is contained in:
Nick Craig-Wood 2018-11-15 16:28:04 +00:00
parent 63a2a935fc
commit 084fe38922
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fstest/fstests/fstests.go
View File

@ -380,9 +380,25 @@ func Run(t *testing.T, opt *Opt) {
require.NoError(t, err)
})
// Return true if f (or any of the things it wraps) is bucket
// based but not at the root.
isBucketBasedButNotRoot := func(f fs.Fs) bool {
for {
doUnWrap := f.Features().UnWrap
if doUnWrap == nil {
break
}
f = doUnWrap()
}
return f.Features().BucketBased && strings.Contains(strings.Trim(f.Root(), "/"), "/")
}
// TestFsRmdirNotFound tests deleting a non existent directory
t.Run("TestFsRmdirNotFound", func(t *testing.T) {
skipIfNotOk(t)
if isBucketBasedButNotRoot(remote) {
t.Skip("Skipping test as non root bucket based remote")
}
err := remote.Rmdir("")
assert.Error(t, err, "Expecting error on Rmdir non existent")
})
@ -938,6 +954,9 @@ func Run(t *testing.T, opt *Opt) {
// TestFsRmdirFull tests removing a non empty directory
t.Run("TestFsRmdirFull", func(t *testing.T) {
skipIfNotOk(t)
if isBucketBasedButNotRoot(remote) {
t.Skip("Skipping test as non root bucket based remote")
}
err := remote.Rmdir("")
require.Error(t, err, "Expecting error on RMdir on non empty remote")
})
@ -1382,8 +1401,10 @@ func Run(t *testing.T, opt *Opt) {
require.NoError(t, err)
fstest.CheckListing(t, remote, []fstest.Item{})
err = operations.Purge(remote, "")
assert.Error(t, err, "Expecting error after on second purge")
if !isBucketBasedButNotRoot(remote) {
err = operations.Purge(remote, "")
assert.Error(t, err, "Expecting error after on second purge")
}
})
// TestFinalise tidies up after the previous tests