From 3a9c8d29c9f526429736c9a2b3531fa4b5f33651 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 19 Sep 2014 17:30:37 -0700 Subject: [PATCH] This reduces the amount of logging in the integration tests There were a new areas in the brige driver that did not need to have log output. Those were removed. Also set the engine's logging to false when running the integration tests. Signed-off-by: Michael Crosby Upstream-commit: 8a9e827216eb5db4fcbe67c3c638f9e85f4de9bf Component: engine --- components/engine/daemon/networkdriver/bridge/driver.go | 3 --- components/engine/integration/utils_test.go | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/components/engine/daemon/networkdriver/bridge/driver.go b/components/engine/daemon/networkdriver/bridge/driver.go index f44e81ad62..12757c1730 100644 --- a/components/engine/daemon/networkdriver/bridge/driver.go +++ b/components/engine/daemon/networkdriver/bridge/driver.go @@ -101,16 +101,13 @@ func InitDriver(job *engine.Job) engine.Status { if err != nil { // If we're not using the default bridge, fail without trying to create it if !usingDefaultBridge { - job.Logf("bridge not found: %s", bridgeIface) return job.Error(err) } // If the iface is not found, try to create it - job.Logf("creating new bridge for %s", bridgeIface) if err := createBridge(bridgeIP); err != nil { return job.Error(err) } - job.Logf("getting iface addr") addr, err = networkdriver.GetIfaceAddr(bridgeIface) if err != nil { return job.Error(err) diff --git a/components/engine/integration/utils_test.go b/components/engine/integration/utils_test.go index 76f24f58a7..fc80f19744 100644 --- a/components/engine/integration/utils_test.go +++ b/components/engine/integration/utils_test.go @@ -178,6 +178,7 @@ func newTestEngine(t log.Fataler, autorestart bool, root string) *engine.Engine os.MkdirAll(root, 0700) eng := engine.New() + eng.Logging = false // Load default plugins builtins.Register(eng) // (This is manually copied and modified from main() until we have a more generic plugin system)