Move setup() and teardown() into testhelper, too.
diff --git a/openstack/identity/v3/tokens/urls_test.go b/openstack/identity/v3/tokens/urls_test.go
index bcfb7c4..5ff8bc6 100644
--- a/openstack/identity/v3/tokens/urls_test.go
+++ b/openstack/identity/v3/tokens/urls_test.go
@@ -4,15 +4,16 @@
"testing"
"github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/testhelper"
)
func TestTokenURL(t *testing.T) {
- setup()
- defer teardown()
+ testhelper.SetupHTTP()
+ defer testhelper.TeardownHTTP()
- client := gophercloud.ServiceClient{Endpoint: endpoint()}
+ client := gophercloud.ServiceClient{Endpoint: testhelper.Endpoint()}
- expected := endpoint() + "auth/tokens"
+ expected := testhelper.Endpoint() + "auth/tokens"
actual := getTokenURL(&client)
if actual != expected {
t.Errorf("Expected URL %s, but was %s", expected, actual)