tests: Correct error handling

stephenfin · stephenfin · commit 797e0908f127 · 2025-05-26T11:43:05.000+01:00
We get an unexpected response code, not the actual response code. Handle
accordingly.

Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
diff --git a/internal/acceptance/openstack/blockstorage/v3/blockstorage.go b/internal/acceptance/openstack/blockstorage/v3/blockstorage.go
@@ -791,8 +791,10 @@ func Unmanage(t *testing.T, client *gophercloud.ServiceClient, volume *volumes.V
 
 	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
 		}

Original file line number	Diff line number	Diff line change
`@@ -791,8 +791,10 @@ func Unmanage(t testing.T, client gophercloud.ServiceClient, volume *volumes.V`
`791`	`791`
`792`	`792`	`err = gophercloud.WaitFor(context.TODO(), func(ctx context.Context) (bool, error) {`
`793`	`793`	`if _, err := volumes.Get(ctx, client, volume.ID).Extract(); err != nil {`
`794`		`- if _, ok := err.(gophercloud.ErrResourceNotFound); ok {`
`795`		`- return true, nil`
	`794`	`+ if errCode, ok := err.(gophercloud.ErrUnexpectedResponseCode); ok {`
	`795`	`+ if errCode.Actual == 404 {`
	`796`	`+ return true, nil`
	`797`	`+ }`
`796`	`798`	`}`
`797`	`799`	`return false, err`
`798`	`800`	`}`