Merge pull request gophercloud#3381 from shiftstack/fip-forwarding-check

tests: Prefer extension check over environment variable

Author: EmilienM

internal/acceptance/openstack/networking/v2/conditions.go

@@ -2,7 +2,6 @@ package v2
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2"
@@ -17,11 +16,3 @@ func RequireNeutronExtension(t *testing.T, client *gophercloud.ServiceClient, ex
 		t.Skipf("this test requires %s Neutron extension", extension)
 	}
 }
-
-// RequirePortForwarding will restrict a test to only be run in environments
-// that support port forwarding
-func RequirePortForwarding(t *testing.T) {
-	if os.Getenv("OS_PORTFORWARDING_ENVIRONMENT") == "" {
-		t.Skip("this test requires support for port forwarding")
-	}
-}

internal/acceptance/openstack/networking/v2/extensions/layer3/portforwardings_test.go

@@ -15,11 +15,11 @@ import (
 )
 
 func TestLayer3PortForwardingsCreateDelete(t *testing.T) {
-	networking.RequirePortForwarding(t)
-
 	client, err := clients.NewNetworkV2Client()
 	th.AssertNoErr(t, err)
 
+	networking.RequireNeutronExtension(t, client, "floating-ip-port-forwarding")
+
 	choices, err := clients.AcceptanceTestChoicesFromEnv()
 	th.AssertNoErr(t, err)