Skip some tests on windows where the implementation is missing
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
parent
fe5bb4a0fc
commit
a72279e53d
@ -34,4 +34,4 @@ test_script:
|
|||||||
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe integration-parallel"
|
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe integration-parallel"
|
||||||
|
|
||||||
on_success:
|
on_success:
|
||||||
codecov --flag windows
|
codecov --flag windows -f coverage.txt
|
||||||
|
@ -7,6 +7,7 @@ import (
|
|||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
|
"runtime"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -329,7 +330,10 @@ func checkInfo(ctx context.Context, cs content.Store, d digest.Digest, expected
|
|||||||
if info.CreatedAt.After(c2) || info.CreatedAt.Before(c1) {
|
if info.CreatedAt.After(c2) || info.CreatedAt.Before(c1) {
|
||||||
return errors.Errorf("unexpected created at time %s, expected between %s and %s", info.CreatedAt, c1, c2)
|
return errors.Errorf("unexpected created at time %s, expected between %s and %s", info.CreatedAt, c1, c2)
|
||||||
}
|
}
|
||||||
if info.UpdatedAt.After(u2) || info.UpdatedAt.Before(u1) {
|
// FIXME: broken on windows: unexpected updated at time 2017-11-14 13:43:22.178013 -0800 PST,
|
||||||
|
// expected between 2017-11-14 13:43:22.1790195 -0800 PST m=+1.022137300 and
|
||||||
|
// 2017-11-14 13:43:22.1790195 -0800 PST m=+1.022137300
|
||||||
|
if runtime.GOOS != "windows" && (info.UpdatedAt.After(u2) || info.UpdatedAt.Before(u1)) {
|
||||||
return errors.Errorf("unexpected updated at time %s, expected between %s and %s", info.UpdatedAt, u1, u2)
|
return errors.Errorf("unexpected updated at time %s, expected between %s and %s", info.UpdatedAt, u1, u2)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ import (
|
|||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@ -20,7 +21,14 @@ import (
|
|||||||
// - symlink test
|
// - symlink test
|
||||||
// - hardlink test
|
// - hardlink test
|
||||||
|
|
||||||
|
func skipDiffTestOnWindows(t *testing.T) {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
t.Skip("diff implementation is incomplete on windows")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestSimpleDiff(t *testing.T) {
|
func TestSimpleDiff(t *testing.T) {
|
||||||
|
skipDiffTestOnWindows(t)
|
||||||
l1 := fstest.Apply(
|
l1 := fstest.Apply(
|
||||||
fstest.CreateDir("/etc", 0755),
|
fstest.CreateDir("/etc", 0755),
|
||||||
fstest.CreateFile("/etc/hosts", []byte("mydomain 10.0.0.1"), 0644),
|
fstest.CreateFile("/etc/hosts", []byte("mydomain 10.0.0.1"), 0644),
|
||||||
@ -49,6 +57,7 @@ func TestSimpleDiff(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestDirectoryReplace(t *testing.T) {
|
func TestDirectoryReplace(t *testing.T) {
|
||||||
|
skipDiffTestOnWindows(t)
|
||||||
l1 := fstest.Apply(
|
l1 := fstest.Apply(
|
||||||
fstest.CreateDir("/dir1", 0755),
|
fstest.CreateDir("/dir1", 0755),
|
||||||
fstest.CreateFile("/dir1/f1", []byte("#####"), 0644),
|
fstest.CreateFile("/dir1/f1", []byte("#####"), 0644),
|
||||||
@ -109,6 +118,7 @@ func TestFileReplace(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestParentDirectoryPermission(t *testing.T) {
|
func TestParentDirectoryPermission(t *testing.T) {
|
||||||
|
skipDiffTestOnWindows(t)
|
||||||
l1 := fstest.Apply(
|
l1 := fstest.Apply(
|
||||||
fstest.CreateDir("/dir1", 0700),
|
fstest.CreateDir("/dir1", 0700),
|
||||||
fstest.CreateDir("/dir2", 0751),
|
fstest.CreateDir("/dir2", 0751),
|
||||||
@ -134,6 +144,7 @@ func TestParentDirectoryPermission(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
func TestUpdateWithSameTime(t *testing.T) {
|
func TestUpdateWithSameTime(t *testing.T) {
|
||||||
|
skipDiffTestOnWindows(t)
|
||||||
tt := time.Now().Truncate(time.Second)
|
tt := time.Now().Truncate(time.Second)
|
||||||
t1 := tt.Add(5 * time.Nanosecond)
|
t1 := tt.Add(5 * time.Nanosecond)
|
||||||
t2 := tt.Add(6 * time.Nanosecond)
|
t2 := tt.Add(6 * time.Nanosecond)
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/boltdb/bolt"
|
"github.com/boltdb/bolt"
|
||||||
@ -39,6 +40,9 @@ func newTestSnapshotter(ctx context.Context, root string) (snapshot.Snapshotter,
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestMetadata(t *testing.T) {
|
func TestMetadata(t *testing.T) {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
t.Skip("snapshotter not implemented on windows")
|
||||||
|
}
|
||||||
// Snapshot tests require mounting, still requires root
|
// Snapshot tests require mounting, still requires root
|
||||||
testutil.RequiresRoot(t)
|
testutil.RequiresRoot(t)
|
||||||
testsuite.SnapshotterSuite(t, "Metadata", newTestSnapshotter)
|
testsuite.SnapshotterSuite(t, "Metadata", newTestSnapshotter)
|
||||||
|
@ -2,6 +2,7 @@ package naive
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"runtime"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/containerd/containerd/snapshot"
|
"github.com/containerd/containerd/snapshot"
|
||||||
@ -19,6 +20,9 @@ func newSnapshotter(ctx context.Context, root string) (snapshot.Snapshotter, fun
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestNaive(t *testing.T) {
|
func TestNaive(t *testing.T) {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
t.Skip("snapshotter not implemented on windows")
|
||||||
|
}
|
||||||
testutil.RequiresRoot(t)
|
testutil.RequiresRoot(t)
|
||||||
testsuite.SnapshotterSuite(t, "Naive", newSnapshotter)
|
testsuite.SnapshotterSuite(t, "Naive", newSnapshotter)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user