From 1741d669b30710fec1a9d7b7ce3beefaa6026f58 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 17 Oct 2019 02:47:37 +0200 Subject: [PATCH] daemon: suppress logs in unit tests Signed-off-by: Sebastiaan van Stijn --- daemon/container_unix_test.go | 1 + daemon/daemon_unix_test.go | 1 + daemon/health_test.go | 1 + daemon/reload_test.go | 16 ++++++++++++++++ 4 files changed, 19 insertions(+) diff --git a/daemon/container_unix_test.go b/daemon/container_unix_test.go index b4c5f84c7e..b2354d7f13 100644 --- a/daemon/container_unix_test.go +++ b/daemon/container_unix_test.go @@ -24,6 +24,7 @@ func TestContainerWarningHostAndPublishPorts(t *testing.T) { "8080": []nat.PortBinding{{HostPort: "8989"}}, }, warnings: []string{"Published ports are discarded when using host network mode"}}, } + muteLogs() for _, tc := range testCases { hostConfig := &containertypes.HostConfig{ diff --git a/daemon/daemon_unix_test.go b/daemon/daemon_unix_test.go index c884681b9a..7f4b5755d7 100644 --- a/daemon/daemon_unix_test.go +++ b/daemon/daemon_unix_test.go @@ -68,6 +68,7 @@ func TestAdjustCPUShares(t *testing.T) { repository: tmp, root: tmp, } + muteLogs() hostConfig := &containertypes.HostConfig{ Resources: containertypes.Resources{CPUShares: linuxMinCPUShares - 1}, diff --git a/daemon/health_test.go b/daemon/health_test.go index db166317fd..d761dbc2a8 100644 --- a/daemon/health_test.go +++ b/daemon/health_test.go @@ -78,6 +78,7 @@ func TestHealthStates(t *testing.T) { EventsService: e, containersReplica: store, } + muteLogs() c.Config.Healthcheck = &containertypes.HealthConfig{ Retries: 1, diff --git a/daemon/reload_test.go b/daemon/reload_test.go index ffad297f71..71d86f2b97 100644 --- a/daemon/reload_test.go +++ b/daemon/reload_test.go @@ -13,10 +13,16 @@ import ( _ "github.com/docker/docker/pkg/discovery/memory" "github.com/docker/docker/registry" "github.com/docker/libnetwork" + "github.com/sirupsen/logrus" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) +// muteLogs suppresses logs that are generated during the test +func muteLogs() { + logrus.SetLevel(logrus.ErrorLevel) +} + func TestDaemonReloadLabels(t *testing.T) { daemon := &Daemon{ configStore: &config.Config{ @@ -26,6 +32,7 @@ func TestDaemonReloadLabels(t *testing.T) { }, imageService: images.NewImageService(images.ImageServiceConfig{}), } + muteLogs() valuesSets := make(map[string]interface{}) valuesSets["labels"] = "foo:baz" @@ -51,6 +58,7 @@ func TestDaemonReloadAllowNondistributableArtifacts(t *testing.T) { configStore: &config.Config{}, imageService: images.NewImageService(images.ImageServiceConfig{}), } + muteLogs() var err error // Initialize daemon with some registries. @@ -106,6 +114,8 @@ func TestDaemonReloadMirrors(t *testing.T) { daemon := &Daemon{ imageService: images.NewImageService(images.ImageServiceConfig{}), } + muteLogs() + var err error daemon.RegistryService, err = registry.NewService(registry.ServiceOptions{ InsecureRegistries: []string{}, @@ -205,6 +215,8 @@ func TestDaemonReloadInsecureRegistries(t *testing.T) { daemon := &Daemon{ imageService: images.NewImageService(images.ImageServiceConfig{}), } + muteLogs() + var err error // initialize daemon with existing insecure registries: "127.0.0.0/8", "10.10.1.11:5000", "10.10.1.22:5000" daemon.RegistryService, err = registry.NewService(registry.ServiceOptions{ @@ -297,6 +309,8 @@ func TestDaemonReloadNotAffectOthers(t *testing.T) { daemon := &Daemon{ imageService: images.NewImageService(images.ImageServiceConfig{}), } + muteLogs() + daemon.configStore = &config.Config{ CommonConfig: config.CommonConfig{ Labels: []string{"foo:bar"}, @@ -331,6 +345,7 @@ func TestDaemonDiscoveryReload(t *testing.T) { daemon := &Daemon{ imageService: images.NewImageService(images.ImageServiceConfig{}), } + muteLogs() daemon.configStore = &config.Config{ CommonConfig: config.CommonConfig{ ClusterStore: "memory://127.0.0.1", @@ -411,6 +426,7 @@ func TestDaemonDiscoveryReloadFromEmptyDiscovery(t *testing.T) { imageService: images.NewImageService(images.ImageServiceConfig{}), } daemon.configStore = &config.Config{} + muteLogs() valuesSet := make(map[string]interface{}) valuesSet["cluster-store"] = "memory://127.0.0.1:2222"