~ubuntu-branches/ubuntu/saucy/juju-core/saucy-proposed

« back to all changes in this revision

Viewing changes to src/launchpad.net/goose/tools/secgroup-delete-all/main_test.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-07-11 17:18:27 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130711171827-vjqkg40r0dlf7ys2
Tags: 1.11.2-0ubuntu1
* New upstream release.
* Make juju-core the default juju (LP: #1190634):
  - d/control: Add virtual package juju -> juju-core.
  - d/juju-core.postinst.in: Bump priority of alternatives over that of
    python juju packages.
* Enable for all architectures (LP: #1172505):
  - d/control: Version BD on golang-go to >= 2:1.1.1 to ensure CGO
    support for non-x86 archs, make juju-core Arch: any.
  - d/README.source: Dropped - no longer required.
* d/watch: Updated for new upstream tarball naming.

Show diffs side-by-side

added added

removed removed

Lines of Context:
46
46
                Region:     region,
47
47
                TenantName: tenant,
48
48
        }
49
 
        openstack := openstackservice.New(creds)
 
49
        openstack := openstackservice.New(creds, identity.AuthUserPass)
50
50
        openstack.SetupHTTP(s.Mux)
51
51
        return openstack, createNovaClient(creds)
52
52
}
74
74
 
75
75
// deleteGroupError hook raises an error if a group with id 2 is deleted.
76
76
func deleteGroupError(s hook.ServiceControl, args ...interface{}) error {
77
 
        groupId := args[0].(int)
 
77
        groupId := args[0].(string)
78
78
        if groupId == doNotDelete.Id {
79
79
                return fmt.Errorf("cannot delete group %d", groupId)
80
80
        }