Fix GCE unit tests with juju/http client.

sdg0919 · May 30, 2021 · f2ed4c6 · f2ed4c6
1 parent 99bdc80
commit f2ed4c6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/provider/gce/google/auth_test.go b/provider/gce/google/auth_test.go
@@ -5,8 +5,8 @@ package google
 
 import (
 	"context"
-	"net/http"
 
+	jujuhttp "github.com/juju/http/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 )
@@ -18,7 +18,7 @@ type authSuite struct {
 var _ = gc.Suite(&authSuite{})
 
 func (s *authSuite) TestNewComputeService(c *gc.C) {
-	_, err := newComputeService(context.TODO(), s.Credentials, http.DefaultClient)
+	_, err := newComputeService(context.TODO(), s.Credentials, jujuhttp.NewClient())
 	c.Assert(err, jc.ErrorIsNil)
 }
 

diff --git a/provider/gce/google/config_connection_test.go b/provider/gce/google/config_connection_test.go
@@ -4,8 +4,7 @@
 package google_test
 
 import (
-	"net/http"
-
+	jujuhttp "github.com/juju/http/v2"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
@@ -22,7 +21,7 @@ func (*connConfigSuite) TestValidateValid(c *gc.C) {
 	cfg := google.ConnectionConfig{
 		Region:     "spam",
 		ProjectID:  "eggs",
-		HTTPClient: http.DefaultClient,
+		HTTPClient: jujuhttp.NewClient(),
 	}
 	err := cfg.Validate()
 

diff --git a/provider/gce/google/conn_test.go b/provider/gce/google/conn_test.go
@@ -5,9 +5,9 @@ package google_test
 
 import (
 	"context"
-	"net/http"
 
 	"github.com/juju/errors"
+	jujuhttp "github.com/juju/http/v2"
 	jc "github.com/juju/testing/checkers"
 	"google.golang.org/api/compute/v1"
 	gc "gopkg.in/check.v1"
@@ -24,7 +24,7 @@ var _ = gc.Suite(&connSuite{})
 func (s *connSuite) TestConnect(c *gc.C) {
 	google.SetRawConn(s.Conn, nil)
 	service := &compute.Service{}
-	s.PatchValue(google.NewService, func(ctx context.Context, creds *google.Credentials, httpClient *http.Client) (*compute.Service, error) {
+	s.PatchValue(google.NewService, func(ctx context.Context, creds *google.Credentials, httpClient *jujuhttp.Client) (*compute.Service, error) {
 		return service, nil
 	})
 

diff --git a/provider/gce/google/testing_test.go b/provider/gce/google/testing_test.go
@@ -4,8 +4,7 @@
 package google
 
 import (
-	"net/http"
-
+	jujuhttp "github.com/juju/http/v2"
 	"google.golang.org/api/compute/v1"
 	gc "gopkg.in/check.v1"
 
@@ -55,7 +54,7 @@ func (s *BaseSuite) SetUpTest(c *gc.C) {
 	s.ConnCfg = ConnectionConfig{
 		Region:     "a",
 		ProjectID:  "spam",
-		HTTPClient: http.DefaultClient,
+		HTTPClient: jujuhttp.NewClient(),
 	}
 	fake := &fakeConn{}
 	s.Conn = &Connection{