Fix crypt tests on Windows

This commit is contained in:
Nick Craig-Wood 2016-08-24 22:21:34 +01:00
parent 2c13074f6c
commit c2599cb116

View file

@ -12,7 +12,6 @@ import (
"io" "io"
"os" "os"
"path" "path"
"runtime"
"sort" "sort"
"strings" "strings"
"testing" "testing"
@ -277,12 +276,18 @@ func TestFsListDirRoot(t *testing.T) {
func TestFsListSubdir(t *testing.T) { func TestFsListSubdir(t *testing.T) {
skipIfNotOk(t) skipIfNotOk(t)
fileName := file2.Path fileName := file2.Path
if runtime.GOOS == "windows" { var err error
var objs []fs.Object
var dirs []*fs.Dir
for i := 0; i < 2; i++ {
dir, _ := path.Split(fileName)
dir = dir[:len(dir)-1]
objs, dirs, err = fs.NewLister().Start(remote, dir).GetAll()
if err != fs.ErrorDirNotFound {
break
}
fileName = file2.WinPath fileName = file2.WinPath
} }
dir, _ := path.Split(fileName)
dir = dir[:len(dir)-1]
objs, dirs, err := fs.NewLister().Start(remote, dir).GetAll()
require.NoError(t, err) require.NoError(t, err)
require.Len(t, objs, 1) require.Len(t, objs, 1)
assert.Equal(t, fileName, objs[0].Remote()) assert.Equal(t, fileName, objs[0].Remote())