diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2018-04-19 11:14:15 +0200 |
|---|---|---|
| committer | Salahuddin Khan <salah@docker.com> | 2018-09-26 12:28:22 -0700 |
| commit | d3cc071bb98669545d4e3043c9bd85879292b815 (patch) | |
| tree | e0e0de82f841ca2d22804d96578538f3c7cd6318 /integration/image | |
| parent | d0970ab9a4cd7759d08c82b8b12af002d3c88904 (diff) | |
| download | docker-d3cc071bb98669545d4e3043c9bd85879292b815.tar.gz | |
Windows: Start of enabling tests under integration/
- Add windows CI entrypoint script.
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'integration/image')
| -rw-r--r-- | integration/image/commit_test.go | 1 | ||||
| -rw-r--r-- | integration/image/import_test.go | 6 | ||||
| -rw-r--r-- | integration/image/remove_test.go | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go index 4555391262..ad3f89ec79 100644 --- a/integration/image/commit_test.go +++ b/integration/image/commit_test.go @@ -15,6 +15,7 @@ import ( func TestCommitInheritsEnv(t *testing.T) { skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.36"), "broken in earlier versions") + skip.If(t, testEnv.DaemonInfo.OSType == "windows", "FIXME") defer setupTest(t)() client := request.NewAPIClient(t) ctx := context.Background() diff --git a/integration/image/import_test.go b/integration/image/import_test.go index 89dddf2cc8..0bb49c522a 100644 --- a/integration/image/import_test.go +++ b/integration/image/import_test.go @@ -11,13 +11,13 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/internal/test/request" "github.com/docker/docker/internal/testutil" + "github.com/gotestyourself/gotestyourself/skip" ) // Ensure we don't regress on CVE-2017-14992. func TestImportExtremelyLargeImageWorks(t *testing.T) { - if runtime.GOARCH == "arm64" { - t.Skip("effective test will be time out") - } + skip.If(t, runtime.GOARCH == "arm64", "effective test will be time out") + skip.If(t, testEnv.OSType == "windows", "TODO enable on windows") client := request.NewAPIClient(t) diff --git a/integration/image/remove_test.go b/integration/image/remove_test.go index 4f9122a5e3..76d73a7135 100644 --- a/integration/image/remove_test.go +++ b/integration/image/remove_test.go @@ -9,9 +9,11 @@ import ( "github.com/docker/docker/internal/test/request" "gotest.tools/assert" is "gotest.tools/assert/cmp" + "gotest.tools/skip" ) func TestRemoveImageOrphaning(t *testing.T) { + skip.If(t, testEnv.DaemonInfo.OSType == "windows", "FIXME") defer setupTest(t)() ctx := context.Background() client := request.NewAPIClient(t) |