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 <crosbymichael@gmail.com>
| ... | ... |
@@ -101,16 +101,13 @@ func InitDriver(job *engine.Job) engine.Status {
|
| 101 | 101 |
if err != nil {
|
| 102 | 102 |
// If we're not using the default bridge, fail without trying to create it |
| 103 | 103 |
if !usingDefaultBridge {
|
| 104 |
- job.Logf("bridge not found: %s", bridgeIface)
|
|
| 105 | 104 |
return job.Error(err) |
| 106 | 105 |
} |
| 107 | 106 |
// If the iface is not found, try to create it |
| 108 |
- job.Logf("creating new bridge for %s", bridgeIface)
|
|
| 109 | 107 |
if err := createBridge(bridgeIP); err != nil {
|
| 110 | 108 |
return job.Error(err) |
| 111 | 109 |
} |
| 112 | 110 |
|
| 113 |
- job.Logf("getting iface addr")
|
|
| 114 | 111 |
addr, err = networkdriver.GetIfaceAddr(bridgeIface) |
| 115 | 112 |
if err != nil {
|
| 116 | 113 |
return job.Error(err) |
| ... | ... |
@@ -178,6 +178,7 @@ func newTestEngine(t log.Fataler, autorestart bool, root string) *engine.Engine |
| 178 | 178 |
os.MkdirAll(root, 0700) |
| 179 | 179 |
|
| 180 | 180 |
eng := engine.New() |
| 181 |
+ eng.Logging = false |
|
| 181 | 182 |
// Load default plugins |
| 182 | 183 |
builtins.Register(eng) |
| 183 | 184 |
// (This is manually copied and modified from main() until we have a more generic plugin system) |