move unit tests into 'testing' directories
diff --git a/openstack/compute/v2/extensions/defsecrules/testing/doc.go b/openstack/compute/v2/extensions/defsecrules/testing/doc.go
new file mode 100644
index 0000000..7603f83
--- /dev/null
+++ b/openstack/compute/v2/extensions/defsecrules/testing/doc.go
@@ -0,0 +1 @@
+package testing
diff --git a/openstack/compute/v2/extensions/defsecrules/fixtures.go b/openstack/compute/v2/extensions/defsecrules/testing/fixtures.go
similarity index 98%
rename from openstack/compute/v2/extensions/defsecrules/fixtures.go
rename to openstack/compute/v2/extensions/defsecrules/testing/fixtures.go
index 4fee896..e4a62d4 100644
--- a/openstack/compute/v2/extensions/defsecrules/fixtures.go
+++ b/openstack/compute/v2/extensions/defsecrules/testing/fixtures.go
@@ -1,6 +1,4 @@
-// +build fixtures
-
-package defsecrules
+package testing
import (
"fmt"
diff --git a/openstack/compute/v2/extensions/defsecrules/requests_test.go b/openstack/compute/v2/extensions/defsecrules/testing/requests_test.go
similarity index 71%
rename from openstack/compute/v2/extensions/defsecrules/requests_test.go
rename to openstack/compute/v2/extensions/defsecrules/testing/requests_test.go
index df568fe..1f2fb86 100644
--- a/openstack/compute/v2/extensions/defsecrules/requests_test.go
+++ b/openstack/compute/v2/extensions/defsecrules/testing/requests_test.go
@@ -1,8 +1,9 @@
-package defsecrules
+package testing
import (
"testing"
+ "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/defsecrules"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/secgroups"
"github.com/gophercloud/gophercloud/pagination"
th "github.com/gophercloud/gophercloud/testhelper"
@@ -19,13 +20,13 @@
count := 0
- err := List(client.ServiceClient()).EachPage(func(page pagination.Page) (bool, error) {
+ err := defsecrules.List(client.ServiceClient()).EachPage(func(page pagination.Page) (bool, error) {
count++
- actual, err := ExtractDefaultRules(page)
+ actual, err := defsecrules.ExtractDefaultRules(page)
th.AssertNoErr(t, err)
- expected := []DefaultRule{
- DefaultRule{
+ expected := []defsecrules.DefaultRule{
+ {
FromPort: 80,
ID: ruleID,
IPProtocol: "TCP",
@@ -49,17 +50,17 @@
mockCreateRuleResponse(t)
- opts := CreateOpts{
+ opts := defsecrules.CreateOpts{
IPProtocol: "TCP",
FromPort: 80,
ToPort: 80,
CIDR: "10.10.12.0/24",
}
- group, err := Create(client.ServiceClient(), opts).Extract()
+ group, err := defsecrules.Create(client.ServiceClient(), opts).Extract()
th.AssertNoErr(t, err)
- expected := &DefaultRule{
+ expected := &defsecrules.DefaultRule{
ID: ruleID,
FromPort: 80,
ToPort: 80,
@@ -75,17 +76,17 @@
mockCreateRuleResponseICMPZero(t)
- opts := CreateOpts{
+ opts := defsecrules.CreateOpts{
IPProtocol: "ICMP",
FromPort: 0,
ToPort: 0,
CIDR: "10.10.12.0/24",
}
- group, err := Create(client.ServiceClient(), opts).Extract()
+ group, err := defsecrules.Create(client.ServiceClient(), opts).Extract()
th.AssertNoErr(t, err)
- expected := &DefaultRule{
+ expected := &defsecrules.DefaultRule{
ID: ruleID,
FromPort: 0,
ToPort: 0,
@@ -101,10 +102,10 @@
mockGetRuleResponse(t, ruleID)
- group, err := Get(client.ServiceClient(), ruleID).Extract()
+ group, err := defsecrules.Get(client.ServiceClient(), ruleID).Extract()
th.AssertNoErr(t, err)
- expected := &DefaultRule{
+ expected := &defsecrules.DefaultRule{
ID: ruleID,
FromPort: 80,
ToPort: 80,
@@ -121,6 +122,6 @@
mockDeleteRuleResponse(t, ruleID)
- err := Delete(client.ServiceClient(), ruleID).ExtractErr()
+ err := defsecrules.Delete(client.ServiceClient(), ruleID).ExtractErr()
th.AssertNoErr(t, err)
}