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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/controller/destroy_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:
56
56
 
57
57
        s.otherEnvOwner = names.NewUserTag("jess@dummy")
58
58
        s.otherState = factory.NewFactory(s.State).MakeModel(c, &factory.ModelParams{
59
 
                Name:    "dummytoo",
60
 
                Owner:   s.otherEnvOwner,
61
 
                Prepare: true,
 
59
                Name:  "dummytoo",
 
60
                Owner: s.otherEnvOwner,
62
61
                ConfigAttrs: testing.Attrs{
63
62
                        "controller": false,
64
63
                },