Merge pull request #8144 from crosbymichael/reduce-logging

This reduces the amount of logging in the integration tests
Upstream-commit: f8c998c605ff1a6f11d371a94820e49ce815d769
Component: engine

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)

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)