Browse code
Improve consistency in "skip"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/01/03 20:19:15Showing 12 changed files
- integration/container/daemon_linux_test.go
- integration/container/export_test.go
- integration/container/links_linux_test.go
- integration/container/logs_test.go
- integration/container/nat_test.go
- integration/container/remove_test.go
- integration/container/rename_test.go
- integration/network/ipvlan/ipvlan_test.go
- integration/network/macvlan/macvlan_test.go
- integration/network/service_test.go
- integration/plugin/logging/logging_linux_test.go
- integration/service/inspect_test.go
| ... | ... |
@@ -29,7 +29,6 @@ import ( |
| 29 | 29 |
func TestContainerStartOnDaemonRestart(t *testing.T) {
|
| 30 | 30 |
skip.If(t, testEnv.IsRemoteDaemon, "cannot start daemon on remote test run") |
| 31 | 31 |
skip.If(t, testEnv.DaemonInfo.OSType == "windows") |
| 32 |
- skip.If(t, testEnv.IsRemoteDaemon(), "cannot start daemon on remote test run") |
|
| 33 | 32 |
t.Parallel() |
| 34 | 33 |
|
| 35 | 34 |
d := daemon.New(t) |
| ... | ... |
@@ -58,7 +58,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
|
| 58 | 58 |
// condition, daemon restart is needed after container creation. |
| 59 | 59 |
func TestExportContainerAfterDaemonRestart(t *testing.T) {
|
| 60 | 60 |
skip.If(t, testEnv.DaemonInfo.OSType == "windows") |
| 61 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 61 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 62 | 62 |
|
| 63 | 63 |
d := daemon.New(t) |
| 64 | 64 |
c := d.NewClientT(t) |
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
// Makes sure that when following we don't get an EOF error when there are no logs |
| 17 | 17 |
func TestLogsFollowTailEmpty(t *testing.T) {
|
| 18 | 18 |
// FIXME(vdemeester) fails on a e2e run on linux... |
| 19 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 19 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 20 | 20 |
defer setupTest(t)() |
| 21 | 21 |
client := testEnv.APIClient() |
| 22 | 22 |
ctx := context.Background() |
| ... | ... |
@@ -22,7 +22,7 @@ import ( |
| 22 | 22 |
|
| 23 | 23 |
func TestNetworkNat(t *testing.T) {
|
| 24 | 24 |
skip.If(t, testEnv.OSType == "windows", "FIXME") |
| 25 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 25 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 26 | 26 |
|
| 27 | 27 |
defer setupTest(t)() |
| 28 | 28 |
|
| ... | ... |
@@ -41,7 +41,7 @@ func TestNetworkNat(t *testing.T) {
|
| 41 | 41 |
|
| 42 | 42 |
func TestNetworkLocalhostTCPNat(t *testing.T) {
|
| 43 | 43 |
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "FIXME") |
| 44 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 44 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 45 | 45 |
|
| 46 | 46 |
defer setupTest(t)() |
| 47 | 47 |
|
| ... | ... |
@@ -59,7 +59,7 @@ func TestNetworkLocalhostTCPNat(t *testing.T) {
|
| 59 | 59 |
|
| 60 | 60 |
func TestNetworkLoopbackNat(t *testing.T) {
|
| 61 | 61 |
skip.If(t, testEnv.OSType == "windows", "FIXME") |
| 62 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 62 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 63 | 63 |
|
| 64 | 64 |
defer setupTest(t)() |
| 65 | 65 |
|
| ... | ... |
@@ -25,7 +25,7 @@ func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {
|
| 25 | 25 |
|
| 26 | 26 |
// Test case for #5244: `docker rm` fails if bind dir doesn't exist anymore |
| 27 | 27 |
func TestRemoveContainerWithRemovedVolume(t *testing.T) {
|
| 28 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 28 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 29 | 29 |
|
| 30 | 30 |
defer setupTest(t)() |
| 31 | 31 |
ctx := context.Background() |
| ... | ... |
@@ -190,7 +190,7 @@ func TestRenameContainerWithSameName(t *testing.T) {
|
| 190 | 190 |
// of the linked container should be updated so that the other |
| 191 | 191 |
// container could still reference to the container that is renamed. |
| 192 | 192 |
func TestRenameContainerWithLinkedContainer(t *testing.T) {
|
| 193 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 193 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 194 | 194 |
skip.If(t, testEnv.OSType == "windows", "FIXME") |
| 195 | 195 |
|
| 196 | 196 |
defer setupTest(t)() |
| ... | ... |
@@ -20,7 +20,7 @@ import ( |
| 20 | 20 |
func TestDockerNetworkIpvlanPersistance(t *testing.T) {
|
| 21 | 21 |
// verify the driver automatically provisions the 802.1q link (di-dummy0.70) |
| 22 | 22 |
skip.If(t, testEnv.DaemonInfo.OSType == "windows") |
| 23 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 23 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 24 | 24 |
skip.If(t, !ipvlanKernelSupport(), "Kernel doesn't support ipvlan") |
| 25 | 25 |
|
| 26 | 26 |
d := daemon.New(t, daemon.WithExperimental) |
| ... | ... |
@@ -48,7 +48,7 @@ func TestDockerNetworkIpvlanPersistance(t *testing.T) {
|
| 48 | 48 |
|
| 49 | 49 |
func TestDockerNetworkIpvlan(t *testing.T) {
|
| 50 | 50 |
skip.If(t, testEnv.DaemonInfo.OSType == "windows") |
| 51 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 51 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 52 | 52 |
skip.If(t, !ipvlanKernelSupport(), "Kernel doesn't support ipvlan") |
| 53 | 53 |
|
| 54 | 54 |
for _, tc := range []struct {
|
| ... | ... |
@@ -19,7 +19,7 @@ import ( |
| 19 | 19 |
|
| 20 | 20 |
func TestDockerNetworkMacvlanPersistance(t *testing.T) {
|
| 21 | 21 |
// verify the driver automatically provisions the 802.1q link (dm-dummy0.60) |
| 22 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 22 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 23 | 23 |
skip.If(t, !macvlanKernelSupport(), "Kernel doesn't support macvlan") |
| 24 | 24 |
|
| 25 | 25 |
d := daemon.New(t) |
| ... | ... |
@@ -42,7 +42,7 @@ func TestDockerNetworkMacvlanPersistance(t *testing.T) {
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
func TestDockerNetworkMacvlan(t *testing.T) {
|
| 45 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 45 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 46 | 46 |
skip.If(t, !macvlanKernelSupport(), "Kernel doesn't support macvlan") |
| 47 | 47 |
|
| 48 | 48 |
for _, tc := range []struct {
|
| ... | ... |
@@ -27,7 +27,7 @@ func delInterface(t *testing.T, ifName string) {
|
| 27 | 27 |
|
| 28 | 28 |
func TestDaemonRestartWithLiveRestore(t *testing.T) {
|
| 29 | 29 |
skip.If(t, testEnv.OSType == "windows") |
| 30 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 30 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 31 | 31 |
skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") |
| 32 | 32 |
d := daemon.New(t) |
| 33 | 33 |
defer d.Stop(t) |
| ... | ... |
@@ -50,7 +50,7 @@ func TestDaemonRestartWithLiveRestore(t *testing.T) {
|
| 50 | 50 |
func TestDaemonDefaultNetworkPools(t *testing.T) {
|
| 51 | 51 |
skip.If(t, testEnv.OSType == "windows") |
| 52 | 52 |
// Remove docker0 bridge and the start daemon defining the predefined address pools |
| 53 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 53 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 54 | 54 |
skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") |
| 55 | 55 |
defaultNetworkBridge := "docker0" |
| 56 | 56 |
delInterface(t, defaultNetworkBridge) |
| ... | ... |
@@ -92,7 +92,7 @@ func TestDaemonDefaultNetworkPools(t *testing.T) {
|
| 92 | 92 |
|
| 93 | 93 |
func TestDaemonRestartWithExistingNetwork(t *testing.T) {
|
| 94 | 94 |
skip.If(t, testEnv.OSType == "windows") |
| 95 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 95 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 96 | 96 |
skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") |
| 97 | 97 |
defaultNetworkBridge := "docker0" |
| 98 | 98 |
d := daemon.New(t) |
| ... | ... |
@@ -125,7 +125,7 @@ func TestDaemonRestartWithExistingNetwork(t *testing.T) {
|
| 125 | 125 |
|
| 126 | 126 |
func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) {
|
| 127 | 127 |
skip.If(t, testEnv.OSType == "windows") |
| 128 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 128 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 129 | 129 |
skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") |
| 130 | 130 |
defaultNetworkBridge := "docker0" |
| 131 | 131 |
d := daemon.New(t) |
| ... | ... |
@@ -175,7 +175,7 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) {
|
| 175 | 175 |
|
| 176 | 176 |
func TestDaemonWithBipAndDefaultNetworkPool(t *testing.T) {
|
| 177 | 177 |
skip.If(t, testEnv.OSType == "windows") |
| 178 |
- skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 178 |
+ skip.If(t, testEnv.IsRemoteDaemon) |
|
| 179 | 179 |
skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") |
| 180 | 180 |
defaultNetworkBridge := "docker0" |
| 181 | 181 |
d := daemon.New(t) |
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestContinueAfterPluginCrash(t *testing.T) {
|
| 19 |
- skip.If(t, testEnv.IsRemoteDaemon(), "test requires daemon on the same host") |
|
| 19 |
+ skip.If(t, testEnv.IsRemoteDaemon, "test requires daemon on the same host") |
|
| 20 | 20 |
t.Parallel() |
| 21 | 21 |
|
| 22 | 22 |
d := daemon.New(t) |