Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ddb4d48

Browse filesBrowse files
committed
tests: Prefer extension check over environment variable
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent 8319ad1 commit ddb4d48
Copy full SHA for ddb4d48

File tree

Expand file treeCollapse file tree

2 files changed

+2
-11
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-11
lines changed

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

Copy file name to clipboardExpand all lines: internal/acceptance/openstack/networking/v2/conditions.go
-9Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package v2
22

33
import (
44
"context"
5-
"os"
65
"testing"
76

87
"github.com/gophercloud/gophercloud/v2"
@@ -17,11 +16,3 @@ func RequireNeutronExtension(t *testing.T, client *gophercloud.ServiceClient, ex
1716
t.Skipf("this test requires %s Neutron extension", extension)
1817
}
1918
}
20-
21-
// RequirePortForwarding will restrict a test to only be run in environments
22-
// that support port forwarding
23-
func RequirePortForwarding(t *testing.T) {
24-
if os.Getenv("OS_PORTFORWARDING_ENVIRONMENT") == "" {
25-
t.Skip("this test requires support for port forwarding")
26-
}
27-
}

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

Copy file name to clipboardExpand all lines: internal/acceptance/openstack/networking/v2/extensions/layer3/portforwardings_test.go
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import (
1515
)
1616

1717
func TestLayer3PortForwardingsCreateDelete(t *testing.T) {
18-
networking.RequirePortForwarding(t)
19-
2018
client, err := clients.NewNetworkV2Client()
2119
th.AssertNoErr(t, err)
2220

21+
networking.RequireNeutronExtension(t, client, "floating-ip-port-forwarding")
22+
2323
choices, err := clients.AcceptanceTestChoicesFromEnv()
2424
th.AssertNoErr(t, err)
2525

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.