← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/juju/controller/listmodels_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/juju/controller/listmodels_test.go
69
69
                                Name:     model.Name,
70
70
                                UUID:     model.UUID,
71
71
                                OwnerTag: names.NewUserTag(model.Owner).String(),
 
72
                                CloudTag: "cloud-dummy",
72
73
                        }
73
74
                        switch model.Name {
74
75
                        case "test-model1":
75
76
                                last1 := time.Date(2015, 3, 20, 0, 0, 0, 0, time.UTC)
76
 
                                result.Status.Status = status.StatusActive
 
77
                                result.Status.Status = status.Active
77
78
                                if f.user != "" {
78
79
                                        result.Users = []params.ModelUserInfo{{
79
80
                                                UserName:       f.user,
89
90
                                }
90
91
                        case "test-model2":
91
92
                                last2 := time.Date(2015, 3, 1, 0, 0, 0, 0, time.UTC)
92
 
                                result.Status.Status = status.StatusActive
 
93
                                result.Status.Status = status.Active
93
94
                                if f.user != "" {
94
95
                                        result.Users = []params.ModelUserInfo{{
95
96
                                                UserName:       f.user,
98
99
                                        }}
99
100
                                }
100
101
                        case "test-model3":
101
 
                                result.Status.Status = status.StatusDestroying
 
102
                                result.Status.Status = status.Destroying
102
103
                        }
103
104
                        results[i].Result = result
104
105
                }