From a987347884fa223a2637c5775a256c031d40dcdc Mon Sep 17 00:00:00 2001 From: Leandro Motta Barros Date: Tue, 30 Aug 2022 17:34:42 -0300 Subject: [PATCH] Disable new tests that depend on swarm and plugins This is just disabling integration tests that rely on features we do not support. We did this previously (see https://github.com/balena-os/balena-engine/commit/088d3ee4602f0152ac552e13fddc1ca5e39707d5), here we just doing the same thing for test cases introduced since then. Signed-off-by: Leandro Motta Barros Change-type: patch --- integration/plugin/common/plugin_test.go | 6 ++++++ integration/plugin/logging/read_test.go | 2 ++ integration/service/create_test.go | 2 ++ integration/service/jobs_test.go | 6 ++++++ integration/system/info_linux_test.go | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/integration/plugin/common/plugin_test.go b/integration/plugin/common/plugin_test.go index 4a3b60b9c5..ccf6b608cb 100644 --- a/integration/plugin/common/plugin_test.go +++ b/integration/plugin/common/plugin_test.go @@ -61,6 +61,8 @@ func TestPluginInvalidJSON(t *testing.T) { } func TestPluginInstall(t *testing.T) { + t.Skip("plugins aren't supported") + skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, testEnv.OSType == "windows") skip.If(t, testEnv.IsRootless, "rootless mode has different view of localhost") @@ -169,6 +171,8 @@ func TestPluginInstall(t *testing.T) { } func TestPluginsWithRuntimes(t *testing.T) { + t.Skip("plugins aren't supported") + skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, testEnv.IsRootless, "Test not supported on rootless due to buggy daemon setup in rootless mode due to daemon restart") skip.If(t, testEnv.OSType == "windows") @@ -232,6 +236,8 @@ func TestPluginsWithRuntimes(t *testing.T) { } func TestPluginBackCompatMediaTypes(t *testing.T) { + t.Skip("plugins aren't supported") + skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, testEnv.OSType == "windows") skip.If(t, testEnv.IsRootless, "Rootless has a different view of localhost (needed for test registry access)") diff --git a/integration/plugin/logging/read_test.go b/integration/plugin/logging/read_test.go index e84738a72e..00c258b50a 100644 --- a/integration/plugin/logging/read_test.go +++ b/integration/plugin/logging/read_test.go @@ -17,6 +17,8 @@ import ( // TestReadPluginNoRead tests that reads are supported even if the plugin isn't capable. func TestReadPluginNoRead(t *testing.T) { + t.Skip("plugins aren't supported") + if runtime.GOOS == "windows" { t.Skip("no unix domain sockets on Windows") } diff --git a/integration/service/create_test.go b/integration/service/create_test.go index fbc2838149..32fe4eda99 100644 --- a/integration/service/create_test.go +++ b/integration/service/create_test.go @@ -481,6 +481,8 @@ func TestCreateServiceSysctls(t *testing.T) { // capabilities option with the correct value, we can assume that the capabilities has been // plumbed correctly. func TestCreateServiceCapabilities(t *testing.T) { + t.Skip("swarm isn't supported") + skip.If( t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.41"), "setting service capabilities is unsupported before api v1.41", diff --git a/integration/service/jobs_test.go b/integration/service/jobs_test.go index 6379b7cad0..7689720d7d 100644 --- a/integration/service/jobs_test.go +++ b/integration/service/jobs_test.go @@ -18,6 +18,8 @@ import ( // TestCreateJob tests that a Service can be created and run with // mode ReplicatedJob func TestCreateJob(t *testing.T) { + t.Skip("swarm isn't supported") + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, testEnv.DaemonInfo.OSType == "windows") @@ -42,6 +44,8 @@ func TestCreateJob(t *testing.T) { // TestReplicatedJob tests that running a replicated job starts the requisite // number of tasks, func TestReplicatedJob(t *testing.T) { + t.Skip("swarm isn't supported") + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, testEnv.DaemonInfo.OSType == "windows") @@ -86,6 +90,8 @@ func TestReplicatedJob(t *testing.T) { // TestUpdateJob tests that a job can be updated, and that it runs with the // correct parameters. func TestUpdateReplicatedJob(t *testing.T) { + t.Skip("swarm isn't supported") + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, testEnv.DaemonInfo.OSType == "windows") diff --git a/integration/system/info_linux_test.go b/integration/system/info_linux_test.go index 87e691f526..2681a0a3be 100644 --- a/integration/system/info_linux_test.go +++ b/integration/system/info_linux_test.go @@ -52,6 +52,8 @@ func TestInfoAPIVersioned(t *testing.T) { // TestInfoDiscoveryBackend verifies that a daemon run with `--cluster-advertise` and // `--cluster-store` properly returns the backend's endpoint in info output. func TestInfoDiscoveryBackend(t *testing.T) { + t.Skip("consul isn't supported") + skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") const ( @@ -92,6 +94,8 @@ func TestInfoDiscoveryInvalidAdvertise(t *testing.T) { // TestInfoDiscoveryAdvertiseInterfaceName verifies that a daemon run with `--cluster-advertise` // configured with interface name properly show the advertise ip-address in info output. func TestInfoDiscoveryAdvertiseInterfaceName(t *testing.T) { + t.Skip("consul isn't supported") + skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, testEnv.IsRootless, "rootless mode has different view of network") // TODO should we check for networking availability (integration-cli suite checks for networking through `Network()`)