Code review comment for lp:~gz/juju-core/machine_doc_addresses

The attempt to merge lp:~gz/juju-core/machine_doc_addresses into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.694s
ok launchpad.net/juju-core/agent/tools 25.411s
ok launchpad.net/juju-core/bzr 6.382s
ok launchpad.net/juju-core/cert 1.973s
ok launchpad.net/juju-core/charm 0.851s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.019s
ok launchpad.net/juju-core/cmd 0.222s
? launchpad.net/juju-core/cmd/builddb [no test files]
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 102.374s
ok launchpad.net/juju-core/cmd/jujud 50.979s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 0.769s
ok launchpad.net/juju-core/constraints 0.029s
ok launchpad.net/juju-core/container/lxc 0.360s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.278s
ok launchpad.net/juju-core/environs 1.285s
? launchpad.net/juju-core/environs/all [no test files]
ok launchpad.net/juju-core/environs/azure 3.795s
ok launchpad.net/juju-core/environs/cloudinit 0.497s
ok launchpad.net/juju-core/environs/config 0.702s
ok launchpad.net/juju-core/environs/dummy 15.987s
ok launchpad.net/juju-core/environs/ec2 181.819s
ok launchpad.net/juju-core/environs/imagemetadata 0.254s
ok launchpad.net/juju-core/environs/instances 0.251s
ok launchpad.net/juju-core/environs/jujutest 0.242s
ok launchpad.net/juju-core/environs/local 1.198s
? launchpad.net/juju-core/environs/local/storage [no test files]
ok launchpad.net/juju-core/environs/localstorage 0.257s
ok launchpad.net/juju-core/environs/maas 1.992s
ok launchpad.net/juju-core/environs/openstack 3.900s
? launchpad.net/juju-core/environs/provider [no test files]
ok launchpad.net/juju-core/environs/sync 0.239s
ok launchpad.net/juju-core/environs/testing 0.019s
? launchpad.net/juju-core/errors [no test files]
ok launchpad.net/juju-core/instance 0.030s
ok launchpad.net/juju-core/juju 12.057s
ok launchpad.net/juju-core/juju/osenv 0.223s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.024s
ok launchpad.net/juju-core/log/syslog 0.039s
ok launchpad.net/juju-core/names 0.029s
ok launchpad.net/juju-core/rpc 0.260s
ok launchpad.net/juju-core/rpc/jsoncodec 0.213s
ok launchpad.net/juju-core/schema 0.030s

----------------------------------------------------------------------
FAIL: unit_test.go:1019: UnitSuite.TestWatchUnit

[LOG] 16.06797 INFO juju state: opening state; mongo addresses: ["localhost:38293"]; entity ""
[LOG] 16.07628 INFO juju state: connection established
[LOG] 16.10150 INFO juju state: initializing environment
unit_test.go:1053:
    testing.NewNotifyWatcherC(c, s.State, w).AssertOneChange()
testing/watcher.go:85:
    c.Fatalf("watcher sent unexpected change: (_, %v)", ok)
... Error: watcher sent unexpected change: (_, true)

OOPS: 307 passed, 1 FAILED
--- FAIL: TestPackage (69.50 seconds)
FAIL
FAIL launchpad.net/juju-core/state 69.726s
? launchpad.net/juju-core/state/api [no test files]
ok launchpad.net/juju-core/state/api/agent 1.843s
? launchpad.net/juju-core/state/api/common [no test files]
ok launchpad.net/juju-core/state/api/deployer 5.225s
ok launchpad.net/juju-core/state/api/machiner 2.439s
ok launchpad.net/juju-core/state/api/params 0.031s
ok launchpad.net/juju-core/state/api/upgrader 3.060s
ok launchpad.net/juju-core/state/api/watcher 2.901s
ok launchpad.net/juju-core/state/apiserver 2.202s
ok launchpad.net/juju-core/state/apiserver/agent 1.937s
ok launchpad.net/juju-core/state/apiserver/client 11.665s
ok launchpad.net/juju-core/state/apiserver/common 0.045s
ok launchpad.net/juju-core/state/apiserver/deployer 3.691s
ok launchpad.net/juju-core/state/apiserver/machine 2.992s
? launchpad.net/juju-core/state/apiserver/testing [no test files]
ok launchpad.net/juju-core/state/apiserver/upgrader 3.451s
ok launchpad.net/juju-core/state/multiwatcher 1.007s
ok launchpad.net/juju-core/state/presence 6.375s
ok launchpad.net/juju-core/state/statecmd 6.282s
? launchpad.net/juju-core/state/testing [no test files]
ok launchpad.net/juju-core/state/watcher 5.411s
ok launchpad.net/juju-core/store 17.963s
ok launchpad.net/juju-core/testing 1.334s
ok launchpad.net/juju-core/testing/checkers 0.016s
ok launchpad.net/juju-core/thirdparty/pbkdf2 0.139s
ok launchpad.net/juju-core/upstart 0.120s
ok launchpad.net/juju-core/utils 0.952s
ok launchpad.net/juju-core/utils/fslock 0.991s
ok launchpad.net/juju-core/utils/set 0.017s
ok launchpad.net/juju-core/version 0.061s
ok launchpad.net/juju-core/worker 1.488s
ok launchpad.net/juju-core/worker/cleaner 1.209s
ok launchpad.net/juju-core/worker/deployer 3.806s
ok launchpad.net/juju-core/worker/firewaller 11.046s
ok launchpad.net/juju-core/worker/machiner 2.322s
ok launchpad.net/juju-core/worker/minunitsworker 1.158s
ok launchpad.net/juju-core/worker/provisioner 16.631s
ok launchpad.net/juju-core/worker/resumer 1.448s
ok launchpad.net/juju-core/worker/uniter 116.443s
ok launchpad.net/juju-core/worker/uniter/charm 2.397s
ok launchpad.net/juju-core/worker/uniter/debug 2.116s
ok launchpad.net/juju-core/worker/uniter/hook 0.014s
ok launchpad.net/juju-core/worker/uniter/jujuc 0.552s
ok launchpad.net/juju-core/worker/uniter/relation 1.332s
ok launchpad.net/juju-core/worker/upgrader 2.358s

warning: building out-of-date packages:
 launchpad.net/goamz/ec2/ec2test
 launchpad.net/goamz/s3/s3test
 launchpad.net/goose/testservices/hook
 launchpad.net/goose/testservices/identityservice
 launchpad.net/goose/testservices
 launchpad.net/goose/testservices/novaservice
 launchpad.net/goose/testservices/swiftservice
 launchpad.net/goose/testservices/openstackservice
installing these packages with 'go test -i ./...' will speed future tests.