← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gopkg.in/goose.v1/testservices/novaservice/service_http_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/gopkg.in/goose.v1/testservices/novaservice/service_http_test.go
41
41
        identityDouble := identityservice.NewUserPass()
42
42
        userInfo := identityDouble.AddUser("fred", "secret", "tenant")
43
43
        s.token = userInfo.Token
44
 
        s.service = New(s.Server.URL, versionPath, userInfo.TenantId, region, identityDouble)
 
44
        s.service = New(s.Server.URL, versionPath, userInfo.TenantId, region, identityDouble, nil)
45
45
}
46
46
 
47
47
func (s *NovaHTTPSuite) TearDownSuite(c *gc.C) {
51
51
func (s *NovaHTTPSuite) SetUpTest(c *gc.C) {
52
52
        s.HTTPSuite.SetUpTest(c)
53
53
        s.service.SetupHTTP(s.Mux)
 
54
        // this is otherwise handled not directly by nova test service
 
55
        // but by openstack that tries for / before.
 
56
        s.Mux.Handle("/", s.service.handler((*Nova).handleRoot))
54
57
}
55
58
 
56
59
func (s *NovaHTTPSuite) TearDownTest(c *gc.C) {
156
159
                {
157
160
                        unauth:  true,
158
161
                        method:  "GET",
159
 
                        url:     "/",
160
 
                        headers: setHeader(authToken, s.token),
161
 
                        expect:  errNoVersion,
162
 
                },
163
 
                {
164
 
                        unauth:  true,
165
 
                        method:  "GET",
166
162
                        url:     "/any",
167
163
                        headers: setHeader(authToken, s.token),
168
164
                        expect:  errMultipleChoices,
1251
1247
        userInfo := identityDouble.AddUser("fred", "secret", "tenant")
1252
1248
        s.token = userInfo.Token
1253
1249
        c.Assert(s.Server.URL[:8], gc.Equals, "https://")
1254
 
        s.service = New(s.Server.URL, versionPath, userInfo.TenantId, region, identityDouble)
 
1250
        s.service = New(s.Server.URL, versionPath, userInfo.TenantId, region, identityDouble, nil)
1255
1251
}
1256
1252
 
1257
1253
func (s *NovaHTTPSSuite) TearDownSuite(c *gc.C) {