Finalizing most acceptance tests
diff --git a/acceptance/rackspace/db/v1/flavor_test.go b/acceptance/rackspace/db/v1/flavor_test.go
index e121f68..e5131c7 100644
--- a/acceptance/rackspace/db/v1/flavor_test.go
+++ b/acceptance/rackspace/db/v1/flavor_test.go
@@ -3,6 +3,7 @@
package v1
import (
+ os "github.com/rackspace/gophercloud/openstack/db/v1/flavors"
"github.com/rackspace/gophercloud/pagination"
"github.com/rackspace/gophercloud/rackspace/db/v1/flavors"
)
@@ -10,8 +11,8 @@
func (c context) listFlavors() {
c.Logf("Listing flavors")
- err := flavors.List(c.client, c.instanceID).EachPage(func(page pagination.Page) (bool, error) {
- flavorList, err := db.ExtractFlavors(page)
+ err := flavors.List(c.client).EachPage(func(page pagination.Page) (bool, error) {
+ flavorList, err := os.ExtractFlavors(page)
c.AssertNoErr(err)
for _, f := range flavorList {
@@ -21,11 +22,11 @@
return true, nil
})
- c.CheckNoErr(err)
+ c.AssertNoErr(err)
}
func (c context) getFlavor() {
- flavor, err := flavors.Get(c.client, "1").Extract()
+ flavor, err := flavors.Get(c.client, 1).Extract()
c.Logf("Getting flavor %s", flavor.ID)
- c.CheckNoErr(err)
+ c.AssertNoErr(err)
}