← 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/resource/api/server/server_listresources_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/resource/api/server/server_listresources_test.go
52
52
                                        res2,
53
53
                                },
54
54
                        },
55
 
                        // note: nothing for tag1
 
55
                        {
 
56
                                Tag: tag1,
 
57
                        },
56
58
                },
57
59
                CharmStoreResources: []charmresource.Resource{
58
60
                        chres1,
60
62
                },
61
63
        }
62
64
 
63
 
        s.data.ReturnUnits = []names.UnitTag{
64
 
                tag0,
65
 
                tag1,
66
 
        }
67
 
 
68
 
        facade := server.NewFacade(s.data)
 
65
        facade, err := server.NewFacade(s.data, s.newCSClient)
 
66
        c.Assert(err, jc.ErrorIsNil)
69
67
 
70
68
        results, err := facade.ListResources(api.ListResourcesArgs{
71
69
                Entities: []params.Entity{{
104
102
                        },
105
103
                }},
106
104
        })
107
 
        s.stub.CheckCallNames(c, "ListResources", "Units")
 
105
        s.stub.CheckCallNames(c, "ListResources")
108
106
        s.stub.CheckCall(c, 0, "ListResources", "a-service")
109
107
}
110
108
 
111
109
func (s *ListResourcesSuite) TestEmpty(c *gc.C) {
112
 
        facade := server.NewFacade(s.data)
 
110
        facade, err := server.NewFacade(s.data, s.newCSClient)
 
111
        c.Assert(err, jc.ErrorIsNil)
113
112
 
114
113
        results, err := facade.ListResources(api.ListResourcesArgs{
115
114
                Entities: []params.Entity{{
121
120
        c.Check(results, jc.DeepEquals, api.ResourcesResults{
122
121
                Results: []api.ResourcesResult{{}},
123
122
        })
124
 
        s.stub.CheckCallNames(c, "ListResources", "Units")
 
123
        s.stub.CheckCallNames(c, "ListResources")
125
124
}
126
125
 
127
126
func (s *ListResourcesSuite) TestError(c *gc.C) {
128
127
        failure := errors.New("<failure>")
129
128
        s.stub.SetErrors(failure)
130
 
        facade := server.NewFacade(s.data)
 
129
        facade, err := server.NewFacade(s.data, s.newCSClient)
 
130
        c.Assert(err, jc.ErrorIsNil)
131
131
 
132
132
        results, err := facade.ListResources(api.ListResourcesArgs{
133
133
                Entities: []params.Entity{{