← Back to branch summary

~wwitzel3/juju-core/009-ha-rsyslog-api

~wwitzel3/juju-core/009-ha-rsyslog-api

« back to all changes in this revision

Viewing changes to state/api/provisioner/provisioner_test.go

Committer: Michael Foord
Date: 2014-05-15 09:51:55 UTC
mfrom: (2729.1.2 juju-core)
Revision ID: michael.foord@canonical.com-20140515095155-1edbtmb7gdtzfopy

Merge

files removed:
errors

errors/errors.go

errors/errors_test.go

files modified:
agent/agent.go

agent/tools/toolsdir.go

cert/cert.go

cmd/juju/bootstrap_test.go

cmd/juju/common.go

cmd/juju/debuglog.go

cmd/juju/debuglog_test.go

cmd/juju/deploy_test.go

cmd/juju/destroyenvironment_test.go

cmd/juju/removemachine_test.go

cmd/jujud/agent.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

constraints/constraints.go

container/kvm/container.go

container/kvm/kvm.go

container/lxc/instance.go

dependencies.tsv

environs/bootstrap/state.go

environs/bootstrap/synctools.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/config.go

environs/config/config.go

environs/configstore/disk.go

environs/configstore/disk_test.go

environs/configstore/mem.go

environs/emptystorage.go

environs/emptystorage_test.go

environs/filestorage/filestorage.go

environs/filestorage/filestorage_test.go

environs/httpstorage/storage.go

environs/httpstorage/storage_test.go

environs/imagemetadata/generate.go

environs/jujutest/livetests.go

environs/jujutest/tests.go

environs/open.go

environs/open_test.go

environs/simplestreams/datasource.go

environs/simplestreams/simplestreams.go

environs/sshstorage/storage.go

environs/sshstorage/storage_test.go

environs/tools/simplestreams.go

environs/tools/tools.go

environs/tools/tools_test.go

juju/api.go

juju/apiconn_test.go

juju/conn.go

juju/conn_test.go

provider/azure/certfile.go

provider/azure/environ.go

provider/azure/instance.go

provider/azure/instancetype.go

provider/azure/storage.go

provider/azure/storage_test.go

provider/common/destroy_test.go

provider/dummy/storage.go

provider/ec2/ec2.go

provider/ec2/storage.go

provider/joyent/environ_instance.go

provider/joyent/storage.go

provider/joyent/storage_test.go

provider/local/environ.go

provider/local/instance.go

provider/maas/environ.go

provider/maas/environ_whitebox_test.go

provider/maas/storage.go

provider/maas/storage_test.go

provider/manual/environ.go

provider/openstack/provider.go

provider/openstack/storage.go

state/addmachine.go

state/annotator.go

state/api/agent/machine_test.go

state/api/client.go

state/api/machiner/machiner_test.go

state/api/provisioner/provisioner_test.go

state/api/uniter/unit_test.go

state/api/upgrader/unitupgrader_test.go

state/api/upgrader/upgrader_test.go

state/apiserver/admin.go

state/apiserver/charmrevisionupdater/updater.go

state/apiserver/charmrevisionupdater/updater_test.go

state/apiserver/charms.go

state/apiserver/client/api_test.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/apiserver/client/destroy_test.go

state/apiserver/client/status.go

state/apiserver/common/errors.go

state/apiserver/common/errors_test.go

state/apiserver/common/password_test.go

state/apiserver/deployer/deployer_test.go

state/apiserver/firewaller/firewaller_test.go

state/apiserver/keymanager/keymanager.go

state/apiserver/keyupdater/authorisedkeys.go

state/apiserver/machine/machiner.go

state/apiserver/provisioner/provisioner_test.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/apiserver/upgrader/unitupgrader_test.go

state/apiserver/upgrader/upgrader_test.go

state/charm_test.go

state/cleanup.go

state/cleanup_test.go

state/configvalidator_test.go

state/conn_test.go

state/constraints.go

state/environ.go

state/environcapability_test.go

state/machine.go

state/machine_test.go

state/megawatcher.go

state/minimumunits.go

state/open.go

state/policy.go

state/prechecker_test.go

state/relation.go

state/relation_test.go

state/relationunit.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/settings.go

state/settings_test.go

state/state.go

state/state_test.go

state/status.go

state/tools_test.go

state/unit.go

state/unit_test.go

state/user.go

state/watcher.go

testing/mgo.go

worker/authenticationworker/worker.go

worker/deployer/deployer_test.go

worker/firewaller/firewaller.go

worker/instancepoller/aggregate.go

worker/instancepoller/aggregate_test.go

worker/instancepoller/machine_test.go

worker/instancepoller/updater.go

worker/peergrouper/mock_test.go

worker/peergrouper/worker.go

worker/provisioner/kvm-broker_test.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_test.go

worker/rsyslog/worker.go

worker/uniter/charm/bundles.go

worker/uniter/relation/relation.go

worker/uniter/relationer_test.go

worker/uniter/state.go

worker/uniter/uniter_test.go

worker/upgrader/upgrader_test.go

Show diffs side-by-side

added added

removed removed

state/api/provisioner/provisioner_test.go

6

6

import (

7

7

stdtesting "testing"

8

8

9

"github.com/juju/errors"

9

10

jc "github.com/juju/testing/checkers"

10

11

gc "launchpad.net/gocheck"

11

12

12

13

"launchpad.net/juju-core/constraints"

13

14

"launchpad.net/juju-core/container"

14

"launchpad.net/juju-core/errors"

15

15

"launchpad.net/juju-core/instance"

16

16

"launchpad.net/juju-core/juju/testing"

17

17

"launchpad.net/juju-core/names"

Older »