Always execute tests and skip in tests themselves

See issue #40193

Signed-off-by: Sam Whited <sam@samwhited.com>
This commit is contained in:
Sam Whited 2020-02-19 17:03:45 -05:00
parent 750f0d1648
commit a6f99232f5
2 changed files with 6 additions and 8 deletions

View file

@ -19,9 +19,6 @@ func TestMain(m *testing.M) {
fmt.Println(err)
os.Exit(1)
}
if testEnv.OSType != "linux" {
os.Exit(0)
}
err = environment.EnsureFrozenImagesLinux(testEnv)
if err != nil {
fmt.Println(err)

View file

@ -2,13 +2,11 @@ package logging
import (
"bytes"
"testing"
"context"
"time"
"runtime"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
@ -19,6 +17,9 @@ import (
// TestReadPluginNoRead tests that reads are supported even if the plugin isn't capable.
func TestReadPluginNoRead(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("no unix domain sockets on Windows")
}
t.Parallel()
d := daemon.New(t)
d.StartWithBusybox(t, "--iptables=false")