← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/api/modelmanager/modelmanager_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/api/modelmanager/modelmanager_test.go
41
41
 
42
42
        // Numbers coming over the api are floats, not ints.
43
43
        c.Assert(result, jc.DeepEquals, params.ModelConfig{
44
 
                "type":       "dummy",
45
 
                "ca-cert":    coretesting.CACert,
46
 
                "state-port": float64(1234),
47
 
                "api-port":   float64(apiPort),
 
44
                "type":            "dummy",
 
45
                "controller-uuid": coretesting.ModelTag.Id(),
 
46
                "ca-cert":         coretesting.CACert,
 
47
                "state-port":      float64(1234),
 
48
                "api-port":        float64(apiPort),
48
49
        })
49
50
 
50
51
}
58
59
func (s *modelmanagerSuite) TestCreateModelMissingConfig(c *gc.C) {
59
60
        modelManager := s.OpenAPI(c)
60
61
        _, err := modelManager.CreateModel("owner", nil, nil)
61
 
        c.Assert(err, gc.ErrorMatches, `creating config from values failed: name: expected string, got nothing`)
 
62
        c.Assert(err, gc.ErrorMatches, `failed to create config: creating config from values failed: name: expected string, got nothing`)
62
63
}
63
64
 
64
65
func (s *modelmanagerSuite) TestCreateModel(c *gc.C) {