Refactor common code from openstack tests.
diff --git a/openstack/compute/v2/servers/fixtures.go b/openstack/compute/v2/servers/fixtures.go
index 40f6587..3ed8b48 100644
--- a/openstack/compute/v2/servers/fixtures.go
+++ b/openstack/compute/v2/servers/fixtures.go
@@ -2,6 +2,15 @@
package servers
+import (
+ "fmt"
+ "net/http"
+ "testing"
+
+ th "github.com/rackspace/gophercloud/testhelper"
+ "github.com/rackspace/gophercloud/testhelper/client"
+)
+
// ServerListBody contains the canned body of a servers.List response.
const ServerListBody = `
{
@@ -329,3 +338,33 @@
Metadata: map[string]interface{}{},
}
)
+
+// HandleServerCreationSuccessfully sets up the test server to respond to a server creation request
+// with a given response.
+func HandleServerCreationSuccessfully(t *testing.T, response string) {
+ th.Mux.HandleFunc("/servers", func(w http.ResponseWriter, r *http.Request) {
+ th.TestMethod(t, r, "POST")
+ th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+ th.TestJSONRequest(t, r, `{
+ "server": {
+ "name": "derp",
+ "imageRef": "f90f6034-2570-4974-8351-6b49732ef2eb",
+ "flavorRef": "1"
+ }
+ }`)
+
+ w.WriteHeader(http.StatusAccepted)
+ w.Header().Add("Content-Type", "application/json")
+ fmt.Fprintf(w, response)
+ })
+}
+
+// HandleServerDeletionSuccessfully sets up the test server to respond to a server deletion request.
+func HandleServerDeletionSuccessfully(t *testing.T) {
+ th.Mux.HandleFunc("/servers/asdfasdfasdf", func(w http.ResponseWriter, r *http.Request) {
+ th.TestMethod(t, r, "DELETE")
+ th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+
+ w.WriteHeader(http.StatusNoContent)
+ })
+}
diff --git a/openstack/compute/v2/servers/requests_test.go b/openstack/compute/v2/servers/requests_test.go
index a193674..4df5d14 100644
--- a/openstack/compute/v2/servers/requests_test.go
+++ b/openstack/compute/v2/servers/requests_test.go
@@ -59,32 +59,14 @@
func TestCreateServer(t *testing.T) {
th.SetupHTTP()
defer th.TeardownHTTP()
+ HandleServerCreationSuccessfully(t, SingleServerBody)
- th.Mux.HandleFunc("/servers", func(w http.ResponseWriter, r *http.Request) {
- th.TestMethod(t, r, "POST")
- th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
- th.TestJSONRequest(t, r, `{
- "server": {
- "name": "derp",
- "imageRef": "f90f6034-2570-4974-8351-6b49732ef2eb",
- "flavorRef": "1"
- }
- }`)
-
- w.WriteHeader(http.StatusAccepted)
- w.Header().Add("Content-Type", "application/json")
- fmt.Fprintf(w, SingleServerBody)
- })
-
- client := client.ServiceClient()
- actual, err := Create(client, CreateOpts{
+ actual, err := Create(client.ServiceClient(), CreateOpts{
Name: "derp",
ImageRef: "f90f6034-2570-4974-8351-6b49732ef2eb",
FlavorRef: "1",
}).Extract()
- if err != nil {
- t.Fatalf("Unexpected Create error: %v", err)
- }
+ th.AssertNoErr(t, err)
th.CheckDeepEquals(t, ServerDerp, *actual)
}
@@ -92,19 +74,10 @@
func TestDeleteServer(t *testing.T) {
th.SetupHTTP()
defer th.TeardownHTTP()
+ HandleServerDeletionSuccessfully(t)
- th.Mux.HandleFunc("/servers/asdfasdfasdf", func(w http.ResponseWriter, r *http.Request) {
- th.TestMethod(t, r, "DELETE")
- th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
-
- w.WriteHeader(http.StatusNoContent)
- })
-
- client := client.ServiceClient()
- err := Delete(client, "asdfasdfasdf")
- if err != nil {
- t.Fatalf("Unexpected Delete error: %v", err)
- }
+ err := Delete(client.ServiceClient(), "asdfasdfasdf")
+ th.AssertNoErr(t, err)
}
func TestGetServer(t *testing.T) {