← Back to branch summary

~juju-qa/ubuntu/yakkety/juju/2.0-beta12

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/common/controllerconfig_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-07-18 18:41:24 UTC
  • mfrom: (1.4.5)
  • Revision ID: nicholas.skaggs@canonical.com-20160718184124-76sg7nr3zf2o6o63
* New upstream release 2.0-beta12
* Update debian/copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/apiserver/common/controllerconfig_test.go
35
35
        return map[string]interface{}{
36
36
                controller.ControllerUUIDKey: testing.ModelTag.Id(),
37
37
                controller.CACertKey:         testing.CACert,
38
 
                controller.CAPrivateKey:      testing.CAKey,
39
38
                controller.ApiPort:           4321,
40
39
                controller.StatePort:         1234,
41
40
        }, nil
54
53
        c.Assert(err, jc.ErrorIsNil)
55
54
        c.Assert(map[string]interface{}(result.Config), jc.DeepEquals, map[string]interface{}{
56
55
                "ca-cert":         testing.CACert,
57
 
                "ca-private-key":  testing.CAKey,
58
56
                "controller-uuid": "deadbeef-0bad-400d-8000-4b1d0d06f00d",
59
57
                "state-port":      1234,
60
58
                "api-port":        4321,