tests: Avoid use of global mocked server (redux)

A few of these have crept in since.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstack/blockstorage/v3/manageablevolumes/testing/fixtures_test.go

@@ -9,8 +9,8 @@ import (
 	fake "github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
 
-func MockManageExistingResponse(t *testing.T) {
-	th.Mux.HandleFunc("/manageable_volumes", func(w http.ResponseWriter, r *http.Request) {
+func MockManageExistingResponse(t *testing.T, fakeServer th.FakeServer) {
+	fakeServer.Mux.HandleFunc("/manageable_volumes", func(w http.ResponseWriter, r *http.Request) {
 		th.TestMethod(t, r, "POST")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		th.TestHeader(t, r, "Content-Type", "application/json")

openstack/blockstorage/v3/manageablevolumes/testing/requests_test.go

@@ -10,10 +10,10 @@ import (
 )
 
 func TestManageExisting(t *testing.T) {
-	th.SetupHTTP()
-	defer th.TeardownHTTP()
+	fakeServer := th.SetupHTTP()
+	defer fakeServer.Teardown()
 
-	MockManageExistingResponse(t)
+	MockManageExistingResponse(t, fakeServer)
 
 	options := &manageablevolumes.ManageExistingOpts{
 		Host:             "host@lvm#LVM",
@@ -28,7 +28,7 @@ func TestManageExisting(t *testing.T) {
 			"key2": "value2",
 		},
 	}
-	n, err := manageablevolumes.ManageExisting(context.TODO(), client.ServiceClient(), options).Extract()
+	n, err := manageablevolumes.ManageExisting(context.TODO(), client.ServiceClient(fakeServer), options).Extract()
 	th.AssertNoErr(t, err)
 
 	th.AssertEquals(t, n.Host, "host@lvm#LVM")

openstack/blockstorage/v3/volumes/testing/fixtures_test.go

@@ -649,11 +649,11 @@ func MockResetStatusResponse(t *testing.T, fakeServer th.FakeServer) {
 		})
 }
 
-func MockUnmanageResponse(t *testing.T) {
-	th.Mux.HandleFunc("/volumes/cd281d77-8217-4830-be95-9528227c105c/action",
+func MockUnmanageResponse(t *testing.T, fakeServer th.FakeServer) {
+	fakeServer.Mux.HandleFunc("/volumes/cd281d77-8217-4830-be95-9528227c105c/action",
 		func(w http.ResponseWriter, r *http.Request) {
 			th.TestMethod(t, r, "POST")
-			th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
+			th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 			th.TestHeader(t, r, "Content-Type", "application/json")
 			th.TestJSONRequest(t, r, `
 {

openstack/blockstorage/v3/volumes/testing/requests_test.go

@@ -540,11 +540,11 @@ func TestResetStatus(t *testing.T) {
 }
 
 func TestUnmanage(t *testing.T) {
-	th.SetupHTTP()
-	defer th.TeardownHTTP()
+	fakeServer := th.SetupHTTP()
+	defer fakeServer.Teardown()
 
-	MockUnmanageResponse(t)
+	MockUnmanageResponse(t, fakeServer)
 
-	err := volumes.Unmanage(context.TODO(), client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()
+	err := volumes.Unmanage(context.TODO(), client.ServiceClient(fakeServer), "cd281d77-8217-4830-be95-9528227c105c").ExtractErr()
 	th.AssertNoErr(t, err)
 }