jgaunt/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-16 00:04:40 +00:00
Code Issues Projects Releases Wiki Activity

fstest: remove WinPath from fstest.Item

Browse Source
This commit is contained in:
Fabian Möller
2018-11-02 13:16:13 +01:00
committed by Nick Craig-Wood
parent 4627ac5709
commit 97a218903c
3 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fstest/fstests/fstests.go
View File

@@ -292,7 +292,6 @@ func Run(t *testing.T, opt *Opt) {
file2 = fstest.Item{
ModTime: fstest.Time("2001-02-03T04:05:10.123123123Z"),
Path: `hello? sausage/êé/Hello, 世界/ " ' @ < > & ? + ≠/z.txt`,
WinPath: `hello_ sausage/êé/Hello, 世界/ _ ' @ _ _ & _ + ≠/z.txt`,
}
isLocalRemote bool
purged bool // whether the dir has been purged or not
@@ -832,10 +831,6 @@ func Run(t *testing.T, opt *Opt) {
dir, _ := path.Split(fileName)
dir = dir[:len(dir)-1]
objs, dirs, err = walk.GetAll(context.Background(), remote, dir, true, -1)
if err != fs.ErrorDirNotFound {
break
}
fileName = file2.WinPath
}
require.NoError(t, err)
require.Len(t, objs, 1)
@@ -951,7 +946,6 @@ func Run(t *testing.T, opt *Opt) {
// check happy path, i.e. no naming conflicts when rename and move are two
// separate operations
file2Move.Path = "other.txt"
file2Move.WinPath = ""
src := findObject(t, remote, file2.Path)
dst, err := doMove(context.Background(), src, file2Move.Path)
if err == fs.ErrorCantMove {
@@ -1036,7 +1030,6 @@ func Run(t *testing.T, opt *Opt) {
file1Copy.Path = path.Join(newName, file1.Path)
file2Copy := file2
file2Copy.Path = path.Join(newName, file2.Path)
file2Copy.WinPath = path.Join(newName, file2.WinPath)
fstest.CheckListingWithPrecision(t, newRemote, []fstest.Item{file2Copy, file1Copy}, []string{
"new_name",
"new_name/sub_new_name",
@@ -1261,7 +1254,6 @@ func Run(t *testing.T, opt *Opt) {
remoteName := subRemoteName + "/" + file2.Path
file2Copy := file2
file2Copy.Path = "z.txt"
file2Copy.WinPath = ""
fileRemote, err := fs.NewFs(remoteName)
require.NotNil(t, fileRemote)
assert.Equal(t, fs.ErrorIsFile, err)
@@ -1304,7 +1296,6 @@ func Run(t *testing.T, opt *Opt) {
file1Root.Path = path.Join(configLeaf, file1Root.Path)
file2Root := file2
file2Root.Path = path.Join(configLeaf, file2Root.Path)
file2Root.WinPath = path.Join(configLeaf, file2Root.WinPath)
var dirs []string
dir := file2.Path
for {