juju-core

Merge lp://staging/~dimitern/juju-core/137-fix-state-imports into lp://staging/~go-bot/juju-core/trunk

  1. 137-fix-state-imports
  2. Merge into trunk
Proposed by Dimiter Naydenov
Status: Merged
Approved by: Dimiter Naydenov
Approved revision: no longer in the source branch.
Merged at revision: 1817
Proposed branch: lp://staging/~dimitern/juju-core/137-fix-state-imports
Merge into: lp://staging/~go-bot/juju-core/trunk
Prerequisite: lp://staging/~dimitern/juju-core/136-params-error-code-helpers
Diff against target: 4420 lines (+709/-597)
125 files modified
cert/cert_test.go (+1/-1)
cmd/builddb/main.go (+1/-3)
cmd/charmload/main.go (+5/-3)
cmd/juju/addmachine_test.go (+3/-1)
cmd/juju/addrelation_test.go (+1/-0)
cmd/juju/addunit_test.go (+1/-0)
cmd/juju/cmd_test.go (+2/-2)
cmd/juju/constraints_test.go (+2/-0)
cmd/juju/deploy_test.go (+3/-2)
cmd/juju/destroymachine_test.go (+1/-0)
cmd/juju/destroyrelation_test.go (+1/-0)
cmd/juju/destroyservice_test.go (+1/-0)
cmd/juju/destroyunit_test.go (+1/-0)
cmd/juju/endpoint.go (+1/-0)
cmd/juju/expose_test.go (+1/-0)
cmd/juju/helptool_test.go (+1/-0)
cmd/juju/plugin_test.go (+6/-5)
cmd/juju/publish_test.go (+3/-1)
cmd/juju/resolved_test.go (+1/-0)
cmd/juju/scp_test.go (+3/-1)
cmd/juju/ssh_test.go (+5/-3)
cmd/juju/switch.go (+1/-0)
cmd/juju/switch_test.go (+1/-0)
cmd/juju/unexpose_test.go (+1/-0)
cmd/juju/upgradecharm_test.go (+4/-2)
cmd/jujud/main.go (+1/-3)
cmd/jujud/main_test.go (+7/-5)
cmd/plugins/juju-metadata/metadataplugin_test.go (+1/-1)
environs/cloudinit/suite_test.go (+2/-1)
environs/config/home_test.go (+2/-1)
environs/instances/image_test.go (+2/-2)
environs/jujutest/jujutest_test.go (+2/-1)
environs/jujutest/livetests.go (+171/-170)
environs/jujutest/metadata_test.go (+2/-1)
environs/jujutest/tests.go (+65/-65)
environs/localstorage/backend_test.go (+2/-1)
environs/simplestreams/datasource.go (+1/-1)
environs/simplestreams/decode.go (+3/-2)
environs/storage.go (+2/-1)
environs/testing/tools.go (+14/-14)
environs/tools/simplestreams.go (+1/-1)
environs/tools/testing/testing.go (+1/-1)
instance/instance_test.go (+1/-0)
juju/conn_test.go (+2/-2)
juju/testing/repo.go (+30/-28)
log/syslog/config_test.go (+4/-2)
names/environ.go (+3/-1)
names/user.go (+3/-1)
provider/azure/environprovider.go (+3/-1)
provider/azure/storage.go (+1/-0)
provider/ec2/config.go (+2/-0)
provider/ec2/export_test.go (+1/-0)
provider/ec2/instancetype.go (+1/-0)
provider/ec2/suite_test.go (+2/-1)
provider/openstack/config.go (+3/-1)
provider/openstack/live_test.go (+3/-0)
provider/provider_test.go (+2/-1)
rpc/jsoncodec/codec.go (+3/-2)
rpc/jsoncodec/codec_test.go (+5/-3)
rpc/jsoncodec/conn.go (+2/-1)
state/api/agent/state.go (+0/-2)
state/api/apiclient.go (+4/-2)
state/api/params/params.go (+1/-0)
state/api/params/params_test.go (+3/-1)
state/api/watcher/watcher.go (+4/-2)
state/apiserver/admin.go (+2/-1)
state/apiserver/apiserver.go (+8/-6)
state/apiserver/client/api_test.go (+6/-4)
state/apiserver/client/client_test.go (+5/-3)
state/apiserver/common/resource.go (+2/-1)
state/apiserver/login_test.go (+1/-0)
state/apiserver/utils.go (+1/-0)
state/charm_test.go (+2/-2)
state/initialize_test.go (+4/-4)
state/machine_test.go (+8/-8)
state/multiwatcher/multiwatcher.go (+4/-2)
state/multiwatcher/multiwatcher_internal_test.go (+5/-3)
state/presence/presence.go (+6/-4)
state/presence/presence_test.go (+6/-4)
state/relation.go (+1/-1)
state/relation_test.go (+7/-7)
state/relationunit.go (+1/-1)
state/service_test.go (+15/-15)
state/settings_test.go (+3/-4)
state/statecmd/addrelation_test.go (+1/-0)
state/statecmd/destroyrelation_test.go (+5/-4)
state/statecmd/destroyservice_test.go (+1/-0)
state/statecmd/expose_test.go (+1/-0)
state/statecmd/unexpose_test.go (+1/-0)
state/unit.go (+0/-1)
state/unit_test.go (+8/-8)
state/watcher/helpers_test.go (+3/-1)
state/watcher/watcher.go (+4/-2)
state/watcher/watcher_test.go (+5/-3)
store/mgo_test.go (+1/-0)
testing/checkers/bool.go (+8/-8)
testing/checkers/bool_test.go (+12/-10)
testing/checkers/checker.go (+19/-19)
testing/checkers/file.go (+10/-10)
testing/checkers/file_test.go (+21/-20)
testing/checkers/relop.go (+7/-7)
testing/checkers/relop_test.go (+14/-13)
testing/checkers/set_test.go (+1/-0)
testing/cmd.go (+8/-8)
testing/environ.go (+20/-20)
testing/git.go (+3/-3)
testing/http.go (+7/-7)
testing/instance.go (+3/-3)
testing/log_test.go (+1/-0)
testing/mgo.go (+6/-6)
tools/list.go (+1/-1)
utils/attempt_test.go (+3/-1)
utils/fslock/fslock_test.go (+2/-1)
utils/set/strings_test.go (+4/-2)
utils/uuid_test.go (+2/-2)
worker/deployer/simple_test.go (+2/-2)
worker/firewaller/firewaller.go (+3/-1)
worker/provisioner/provisioner_test.go (+2/-2)
worker/resumer/resumer.go (+4/-2)
worker/resumer/resumer_test.go (+1/-0)
worker/uniter/charm/charm_test.go (+2/-2)
worker/uniter/jujuc/ports_test.go (+1/-0)
worker/uniter/jujuc/server_test.go (+2/-2)
worker/uniter/relation/relation_test.go (+5/-5)
worker/uniter/relationer_test.go (+5/-5)
To merge this branch: bzr merge lp://staging/~dimitern/juju-core/137-fix-state-imports
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+185519@code.staging.launchpad.net

Commit message

various: gocheck, checkers, imports fixes

This fixes several things across the codebase:
* gocheck is imported as gc in every file
* testing/checkers is imported as jc in every file
* imports are properly grouped as standard, 3rd party and juju-core

https://codereview.appspot.com/13606045/

R=rogpeppe

Description of the change

various: gocheck, checkers, imports fixes

This fixes several things across the codebase:
* gocheck is imported as gc in every file
* testing/checkers is imported as jc in every file
* imports are properly grouped as standard, 3rd party and juju-core

https://codereview.appspot.com/13606045/

To post a comment you must log in.
Revision history for this message
Roger Peppe (rogpeppe) wrote :

LGTM with one minor point.

https://codereview.appspot.com/13606045/diff/1/names/environ.go
File names/environ.go (left):

https://codereview.appspot.com/13606045/diff/1/names/environ.go#oldcode6
names/environ.go:6: import "strings"
I think this is still fine for a single import.

https://codereview.appspot.com/13606045/diff/1/names/user.go
File names/user.go (left):

https://codereview.appspot.com/13606045/diff/1/names/user.go#oldcode6
names/user.go:6: import "strings"
ditto

https://codereview.appspot.com/13606045/

Revision history for this message
Dimiter Naydenov (dimitern) wrote :
Download full text (5.3 KiB)

Reviewers: mp+185519_code.launchpad.net, rog,

https://codereview.appspot.com/13606045/diff/1/names/environ.go
File names/environ.go (left):

https://codereview.appspot.com/13606045/diff/1/names/environ.go#oldcode6
names/environ.go:6: import "strings"
On 2013/09/13 15:06:55, rog wrote:
> I think this is still fine for a single import.

As agreed online: it's about consistency, and only these 2 files in the
whole codebase import a single package inline, rather than in a block.
There are plenty of examples of single import blocks.

https://codereview.appspot.com/13606045/diff/1/names/user.go
File names/user.go (left):

https://codereview.appspot.com/13606045/diff/1/names/user.go#oldcode6
names/user.go:6: import "strings"
On 2013/09/13 15:06:55, rog wrote:
> ditto

Same answer as above.

Description:
various: gocheck, checkers, imports fixes

This fixes several things across the codebase:
* gocheck is imported as gc in every file
* testing/checkers is imported as jc in every file
* imports are properly grouped as standard, 3rd party and juju-core

https://code.launchpad.net/~dimitern/juju-core/137-fix-state-imports/+merge/185519

Requires:
https://code.launchpad.net/~dimitern/juju-core/136-params-error-code-helpers/+merge/185461

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13606045/

Affected files (+711, -597 lines):
   A [revision details]
   M cert/cert_test.go
   M cmd/builddb/main.go
   M cmd/charmload/main.go
   M cmd/juju/addmachine_test.go
   M cmd/juju/addrelation_test.go
   M cmd/juju/addunit_test.go
   M cmd/juju/cmd_test.go
   M cmd/juju/constraints_test.go
   M cmd/juju/deploy_test.go
   M cmd/juju/destroymachine_test.go
   M cmd/juju/destroyrelation_test.go
   M cmd/juju/destroyservice_test.go
   M cmd/juju/destroyunit_test.go
   M cmd/juju/endpoint.go
   M cmd/juju/expose_test.go
   M cmd/juju/helptool_test.go
   M cmd/juju/plugin_test.go
   M cmd/juju/publish_test.go
   M cmd/juju/resolved_test.go
   M cmd/juju/scp_test.go
   M cmd/juju/ssh_test.go
   M cmd/juju/switch.go
   M cmd/juju/switch_test.go
   M cmd/juju/unexpose_test.go
   M cmd/juju/upgradecharm_test.go
   M cmd/jujud/main.go
   M cmd/jujud/main_test.go
   M cmd/plugins/juju-metadata/metadataplugin_test.go
   M environs/cloudinit/suite_test.go
   M environs/config/home_test.go
   M environs/instances/image_test.go
   M environs/jujutest/jujutest_test.go
   M environs/jujutest/livetests.go
   M environs/jujutest/metadata_test.go
   M environs/jujutest/tests.go
   M environs/localstorage/backend_test.go
   M environs/simplestreams/datasource.go
   M environs/simplestreams/decode.go
   M environs/storage.go
   M environs/testing/tools.go
   M environs/tools/simplestreams.go
   M environs/tools/testing/testing.go
   M instance/instance_test.go
   M juju/conn_test.go
   M juju/testing/repo.go
   M log/syslog/config_test.go
   M names/environ.go
   M names/user.go
   M provider/azure/environprovider.go
   M provider/azure/storage.go
   M provider/ec2/config.go
   M provider/ec2/export_test.go
   M provider/ec2/instancetype.go
   M provider/ec2/suite_test.go
   M provider/openstack/config.go
   M provider/openstack/...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: