Merge pull request gophercloud#3400 from shiftstack/fix-gate

Fix broken build from gophercloud#3332

Author: mandre

internal/acceptance/openstack/blockstorage/v3/blockstorage.go

@@ -789,15 +789,20 @@ func Unmanage(t *testing.T, client *gophercloud.ServiceClient, volume *volumes.V
 		return err
 	}
 
-	gophercloud.WaitFor(context.TODO(), func(ctx context.Context) (bool, error) {
+	err = gophercloud.WaitFor(context.TODO(), func(ctx context.Context) (bool, error) {
 		if _, err := volumes.Get(ctx, client, volume.ID).Extract(); err != nil {
-			if _, ok := err.(gophercloud.ErrResourceNotFound); ok {
-				return true, nil
+			if errCode, ok := err.(gophercloud.ErrUnexpectedResponseCode); ok {
+				if errCode.Actual == 404 {
+					return true, nil
+				}
 			}
 			return false, err
 		}
 		return false, nil
 	})
+	if err != nil {
+		return err
+	}
 
 	t.Logf("Successfully unmanaged volume %s", volume.ID)
 

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)
 }

script/getenvvar

@@ -73,13 +73,13 @@ if 'username' not in auth or 'password' not in auth:
 # """.strip()
 
 result = f"""
-unset OS_CLOUD
-export OS_AUTH_URL={auth['auth_url']}
-export OS_USERNAME={auth['username']}
-export OS_PASSWORD={auth['password']}
-export OS_PROJECT_NAME={auth['project_name']}
-export OS_DOMAIN_ID={auth['user_domain_id']}
-export OS_REGION_NAME={cloud['region_name']}
+unset OS_CLOUD;
+export OS_AUTH_URL={auth['auth_url']};
+export OS_USERNAME={auth['username']};
+export OS_PASSWORD={auth['password']};
+export OS_PROJECT_NAME={auth['project_name']};
+export OS_DOMAIN_ID={auth['user_domain_id']};
+export OS_REGION_NAME={cloud['region_name']};
 """
 
-print(result)
+print(result.strip())