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

« back to all changes in this revision

Viewing changes to src/gopkg.in/goose.v1/identity/local_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:
12
12
        "gopkg.in/goose.v1/testservices/openstackservice"
13
13
)
14
14
 
15
 
func registerLocalTests() {
16
 
        gc.Suite(&localLiveSuite{})
 
15
func registerLocalTests(authMode identity.AuthMode) {
 
16
        lt := LiveTests{authMode: authMode}
 
17
        gc.Suite(&localLiveSuite{LiveTests: lt})
17
18
}
18
19
 
19
20
// localLiveSuite runs tests from LiveTests using a fake
35
36
        s.Mux = http.NewServeMux()
36
37
        s.Server.Config.Handler = s.Mux
37
38
 
 
39
        serverURL := s.Server.URL
 
40
        if s.authMode == identity.AuthUserPassV3 {
 
41
                serverURL = serverURL + "/v3"
 
42
        }
38
43
        // Set up an Openstack service.
39
44
        s.cred = &identity.Credentials{
40
 
                URL:        s.Server.URL,
 
45
                URL:        serverURL,
41
46
                User:       "fred",
42
47
                Secrets:    "secret",
43
48
                Region:     "zone1.some region",
44
49
                TenantName: "tenant",
 
50
                DomainName: "default",
45
51
        }
46
 
        openstack := openstackservice.New(s.cred, identity.AuthUserPass)
 
52
        openstack := openstackservice.New(s.cred, s.authMode)
47
53
        openstack.SetupHTTP(s.Mux)
48
54
 
 
55
        openstack.Identity.AddUser("fred", "secret", "tenant")
49
56
        s.LiveTests.SetUpSuite(c)
50
57
}
51
58