Go OpenStack Exchange

Merge lp://staging/goose into lp://staging/~go-bot/goose/test

  1. trunk
  2. Merge into test
Proposed by John A Meinel
Status: Merged
Approved by: John A Meinel
Approved revision: 99
Merge reported by: John A Meinel
Merged at revision: not available
Proposed branch: lp://staging/goose
Merge into: lp://staging/~go-bot/goose/test
Diff against target: 2679 lines (+931/-386)
32 files modified
client/client.go (+2/-0)
client/client_test.go (+5/-3)
client/live_test.go (+5/-5)
client/local_test.go (+10/-2)
goose.go (+3/-0)
http/client.go (+1/-0)
http/client_test.go (+51/-7)
identity/identity.go (+9/-3)
identity/identity_test.go (+51/-0)
identity/keypair.go (+41/-0)
identity/keystone.go (+89/-0)
identity/local_test.go (+22/-1)
identity/userpass.go (+1/-75)
nova/json.go (+167/-66)
nova/json_test.go (+1/-1)
nova/local_test.go (+7/-5)
nova/nova.go (+19/-24)
nova/nova_test.go (+2/-2)
swift/local_test.go (+2/-1)
testservices/identityservice/identityservice.go (+1/-0)
testservices/identityservice/keypair.go (+123/-0)
testservices/identityservice/keypair_test.go (+130/-0)
testservices/identityservice/legacy.go (+4/-0)
testservices/identityservice/userpass.go (+5/-3)
testservices/novaservice/service.go (+38/-38)
testservices/novaservice/service_http.go (+12/-35)
testservices/novaservice/service_http_test.go (+34/-49)
testservices/novaservice/service_test.go (+61/-61)
testservices/openstackservice/openstack.go (+27/-3)
tools/secgroup-delete-all/main_test.go (+2/-2)
version.go (+3/-0)
version_test.go (+3/-0)
To merge this branch: bzr merge lp://staging/goose
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+163468@code.staging.launchpad.net

Commit message

Merge trunk into test branch.

Description of the change

Seeing if we get proper test hook triggers.

To post a comment you must log in.
Revision history for this message
Go Bot (go-bot) wrote :
Download full text (4.9 KiB)

The attempt to merge lp:goose into lp:~go-bot/goose/test failed. Below is the output from the failed tests.

cd /home/tarmac/trees/src/launchpad.net/juju-core
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/juju-core
bzr tags
cd /home/tarmac/trees/src/launchpad.net/juju-core
bzr update -r revno:-1
cd /home/tarmac/trees/src/labix.org/v2/mgo
bzr pull --overwrite
cd /home/tarmac/trees/src/labix.org/v2/mgo
bzr tags
cd /home/tarmac/trees/src/labix.org/v2/mgo
bzr update -r go1
cd /home/tarmac/trees/src/launchpad.net/goyaml
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/goyaml
bzr tags
cd /home/tarmac/trees/src/launchpad.net/goyaml
bzr update -r revno:-1
cd /home/tarmac/trees/src/launchpad.net/gnuflag
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/gnuflag
bzr tags
cd /home/tarmac/trees/src/launchpad.net/gnuflag
bzr update -r revno:-1
cd /home/tarmac/trees/src/code.google.com/p/go.net
hg pull
cd /home/tarmac/trees/src/code.google.com/p/go.net
hg tags
cd /home/tarmac/trees/src/code.google.com/p/go.net
hg branches
cd /home/tarmac/trees/src/code.google.com/p/go.net
hg update default
cd /home/tarmac/trees/src/launchpad.net/goamz
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/goamz
bzr tags
cd /home/tarmac/trees/src/launchpad.net/goamz
bzr update -r revno:-1
cd /home/tarmac/trees/src/launchpad.net/gomaasapi
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/gomaasapi
bzr tags
cd /home/tarmac/trees/src/launchpad.net/gomaasapi
bzr update -r revno:-1
cd /home/tarmac/trees/src/launchpad.net/goose
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/tomb
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/tomb
bzr tags
cd /home/tarmac/trees/src/launchpad.net/tomb
bzr update -r revno:-1
cd /home/tarmac/trees/src/launchpad.net/lpad
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/lpad
bzr tags
cd /home/tarmac/trees/src/launchpad.net/lpad
bzr update -r revno:-1
cd /home/tarmac/trees/src/launchpad.net/gocheck
bzr pull --overwrite
cd /home/tarmac/trees/src/launchpad.net/gocheck
bzr tags
cd /home/tarmac/trees/src/launchpad.net/gocheck
bzr update -r revno:-1

----------------------------------------------------------------------
PANIC: local_test.go:39: localLiveSuite.SetUpSuite

Using identity service test double
... Panic: interface conversion: identityservice.IdentityService is *identityservice.KeyPair, not *identityservice.UserPass (PC=0x4112F8)

/build/buildd/golang-1/src/pkg/runtime/proc.c:1443
  in panic
/build/buildd/golang-1/src/pkg/runtime/iface.c:247
  in assertI2Tret
/build/buildd/golang-1/src/pkg/runtime/iface.c:227
  in assertI2T
/home/tarmac/trees/src/launchpad.net/goose/testservices/openstackservice/openstack.go:52
  in New
local_test.go:54
  in localLiveSuite.SetUpSuite
OOPS: 16 passed, 4 skipped, 1 FIXTURE-PANICKED, 10 MISSED
--- FAIL: Test (0.01 seconds)
FAIL
FAIL launchpad.net/goose/client 0.025s
ok launchpad.net/goose/errors 0.007s
ok launchpad.net/goose/glance 0.012s
ok launchpad.net/goose/http 0.014s
ok launchpad.net/goose/identity 0.021s
ok launchpad.net/goose/nova 0.093s
ok launchpad.net/goose/swift 0.051s
ok launchpad.net/goose/sync 0....

Read more...

Revision history for this message
Go Bot (go-bot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches