mirror of
https://github.com/octoleo/restic.git
synced 2024-10-31 19:02:32 +00:00
enable ysmlink tests for windows
This commit is contained in:
parent
144257f8bd
commit
8fe159cc5a
@ -78,10 +78,6 @@ func TestCreateFiles(t testing.TB, target string, dir TestDir) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
case TestSymlink:
|
case TestSymlink:
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
err := fs.Symlink(filepath.FromSlash(it.Target), targetPath)
|
err := fs.Symlink(filepath.FromSlash(it.Target), targetPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@ -139,16 +135,6 @@ func TestEnsureFiles(t testing.TB, target string, dir TestDir) {
|
|||||||
|
|
||||||
// first, test that all items are there
|
// first, test that all items are there
|
||||||
TestWalkFiles(t, target, dir, func(path string, item interface{}) error {
|
TestWalkFiles(t, target, dir, func(path string, item interface{}) error {
|
||||||
// ignore symlinks on Windows
|
|
||||||
if _, ok := item.(TestSymlink); ok && runtime.GOOS == "windows" {
|
|
||||||
// mark paths and parents as checked
|
|
||||||
pathsChecked[path] = struct{}{}
|
|
||||||
for parent := filepath.Dir(path); parent != target; parent = filepath.Dir(parent) {
|
|
||||||
pathsChecked[parent] = struct{}{}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
fi, err := fs.Lstat(path)
|
fi, err := fs.Lstat(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -298,10 +284,6 @@ func TestEnsureTree(ctx context.Context, t testing.TB, prefix string, repo resti
|
|||||||
}
|
}
|
||||||
TestEnsureFileContent(ctx, t, repo, nodePrefix, node, e)
|
TestEnsureFileContent(ctx, t, repo, nodePrefix, node, e)
|
||||||
case TestSymlink:
|
case TestSymlink:
|
||||||
// skip symlinks on windows
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if node.Type != "symlink" {
|
if node.Type != "symlink" {
|
||||||
t.Errorf("tree node %v has wrong type %q, want %q", nodePrefix, node.Type, "file")
|
t.Errorf("tree node %v has wrong type %q, want %q", nodePrefix, node.Type, "file")
|
||||||
}
|
}
|
||||||
@ -313,12 +295,6 @@ func TestEnsureTree(ctx context.Context, t testing.TB, prefix string, repo resti
|
|||||||
}
|
}
|
||||||
|
|
||||||
for name := range dir {
|
for name := range dir {
|
||||||
// skip checking symlinks on Windows
|
|
||||||
entry := dir[name]
|
|
||||||
if _, ok := entry.(TestSymlink); ok && runtime.GOOS == "windows" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
_, ok := checked[name]
|
_, ok := checked[name]
|
||||||
if !ok {
|
if !ok {
|
||||||
t.Errorf("tree %v: expected node %q not found, has: %v", prefix, name, nodeNames)
|
t.Errorf("tree %v: expected node %q not found, has: %v", prefix, name, nodeNames)
|
||||||
|
@ -6,7 +6,6 @@ import (
|
|||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -68,10 +67,6 @@ func createFilesAt(t testing.TB, targetdir string, files map[string]interface{})
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
case TestSymlink:
|
case TestSymlink:
|
||||||
// ignore symlinks on windows
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
err := fs.Symlink(filepath.FromSlash(it.Target), target)
|
err := fs.Symlink(filepath.FromSlash(it.Target), target)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@ -93,7 +88,7 @@ func TestTestCreateFiles(t *testing.T) {
|
|||||||
},
|
},
|
||||||
"sub": TestDir{
|
"sub": TestDir{
|
||||||
"subsub": TestDir{
|
"subsub": TestDir{
|
||||||
"link": TestSymlink{Target: "x/y/z"},
|
"link": TestSymlink{Target: filepath.Clean("x/y/z")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -101,7 +96,7 @@ func TestTestCreateFiles(t *testing.T) {
|
|||||||
"foo": TestFile{Content: "foo"},
|
"foo": TestFile{Content: "foo"},
|
||||||
"subdir": TestDir{},
|
"subdir": TestDir{},
|
||||||
"subdir/subfile": TestFile{Content: "bar"},
|
"subdir/subfile": TestFile{Content: "bar"},
|
||||||
"sub/subsub/link": TestSymlink{Target: "x/y/z"},
|
"sub/subsub/link": TestSymlink{Target: filepath.Clean("x/y/z")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -120,13 +115,6 @@ func TestTestCreateFiles(t *testing.T) {
|
|||||||
TestCreateFiles(t, tempdir, test.dir)
|
TestCreateFiles(t, tempdir, test.dir)
|
||||||
|
|
||||||
for name, item := range test.files {
|
for name, item := range test.files {
|
||||||
// don't check symlinks on windows
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
if _, ok := item.(TestSymlink); ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
targetPath := filepath.Join(tempdir, filepath.FromSlash(name))
|
targetPath := filepath.Join(tempdir, filepath.FromSlash(name))
|
||||||
fi, err := fs.Lstat(targetPath)
|
fi, err := fs.Lstat(targetPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -233,13 +221,12 @@ func TestTestEnsureFiles(t *testing.T) {
|
|||||||
expectFailure bool
|
expectFailure bool
|
||||||
files map[string]interface{}
|
files map[string]interface{}
|
||||||
want TestDir
|
want TestDir
|
||||||
unixOnly bool
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
files: map[string]interface{}{
|
files: map[string]interface{}{
|
||||||
"foo": TestFile{Content: "foo"},
|
"foo": TestFile{Content: "foo"},
|
||||||
"subdir/subfile": TestFile{Content: "bar"},
|
"subdir/subfile": TestFile{Content: "bar"},
|
||||||
"x/y/link": TestSymlink{Target: "../../foo"},
|
"x/y/link": TestSymlink{Target: filepath.Clean("../../foo")},
|
||||||
},
|
},
|
||||||
want: TestDir{
|
want: TestDir{
|
||||||
"foo": TestFile{Content: "foo"},
|
"foo": TestFile{Content: "foo"},
|
||||||
@ -248,7 +235,7 @@ func TestTestEnsureFiles(t *testing.T) {
|
|||||||
},
|
},
|
||||||
"x": TestDir{
|
"x": TestDir{
|
||||||
"y": TestDir{
|
"y": TestDir{
|
||||||
"link": TestSymlink{Target: "../../foo"},
|
"link": TestSymlink{Target: filepath.Clean("../../foo")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -295,7 +282,6 @@ func TestTestEnsureFiles(t *testing.T) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
expectFailure: true,
|
expectFailure: true,
|
||||||
unixOnly: true,
|
|
||||||
files: map[string]interface{}{
|
files: map[string]interface{}{
|
||||||
"foo": TestFile{Content: "foo"},
|
"foo": TestFile{Content: "foo"},
|
||||||
},
|
},
|
||||||
@ -305,7 +291,6 @@ func TestTestEnsureFiles(t *testing.T) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
expectFailure: true,
|
expectFailure: true,
|
||||||
unixOnly: true,
|
|
||||||
files: map[string]interface{}{
|
files: map[string]interface{}{
|
||||||
"foo": TestSymlink{Target: "xxx"},
|
"foo": TestSymlink{Target: "xxx"},
|
||||||
},
|
},
|
||||||
@ -339,11 +324,6 @@ func TestTestEnsureFiles(t *testing.T) {
|
|||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
t.Run("", func(t *testing.T) {
|
t.Run("", func(t *testing.T) {
|
||||||
if test.unixOnly && runtime.GOOS == "windows" {
|
|
||||||
t.Skip("skip on Windows")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
tempdir, cleanup := restictest.TempDir(t)
|
tempdir, cleanup := restictest.TempDir(t)
|
||||||
defer cleanup()
|
defer cleanup()
|
||||||
|
|
||||||
@ -368,7 +348,6 @@ func TestTestEnsureSnapshot(t *testing.T) {
|
|||||||
expectFailure bool
|
expectFailure bool
|
||||||
files map[string]interface{}
|
files map[string]interface{}
|
||||||
want TestDir
|
want TestDir
|
||||||
unixOnly bool
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
files: map[string]interface{}{
|
files: map[string]interface{}{
|
||||||
@ -451,7 +430,6 @@ func TestTestEnsureSnapshot(t *testing.T) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
expectFailure: true,
|
expectFailure: true,
|
||||||
unixOnly: true,
|
|
||||||
files: map[string]interface{}{
|
files: map[string]interface{}{
|
||||||
"foo": TestSymlink{Target: filepath.FromSlash("x/y/z")},
|
"foo": TestSymlink{Target: filepath.FromSlash("x/y/z")},
|
||||||
},
|
},
|
||||||
@ -476,11 +454,6 @@ func TestTestEnsureSnapshot(t *testing.T) {
|
|||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
t.Run("", func(t *testing.T) {
|
t.Run("", func(t *testing.T) {
|
||||||
if test.unixOnly && runtime.GOOS == "windows" {
|
|
||||||
t.Skip("skip on Windows")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user