Refactor tests to make it runnable within Google.

Author: easwars

tests/common.go

@@ -38,8 +38,6 @@ import (
 	"log"
 	"net/http"
 	"os"
-	"os/exec"
-	"path/filepath"
 	"testing"
 	"time"
 
@@ -50,8 +48,6 @@ import (
 
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/context"
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
 	compute "google.golang.org/api/compute/v1"
 )
 
@@ -72,10 +68,7 @@ var (
 	token          = flag.String("token", "", "When set, the proxy uses this Bearer token for authorization.")
 )
 
-const (
-	defaultOS       = "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-8-jessie-v20160329"
-	buildShLocation = "cmd/cloud_sql_proxy/build.sh"
-)
+const defaultOS = "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-8-jessie-v20160329"
 
 type logger interface {
 	Log(args ...interface{})
@@ -159,31 +152,6 @@ func (p *process) Close() error {
 	return p.sess.Close()
 }
 
-func compileProxy() (string, error) {
-	// Find the 'build.sh' script by looking for it in cwd, cwd/.., and cwd/../..
-	var buildSh string
-
-	var parentPath []string
-	for parents := 0; parents < 2; parents++ {
-		cur := filepath.Join(append(parentPath, buildShLocation)...)
-		if _, err := os.Stat(cur); err == nil {
-			buildSh = cur
-			break
-		}
-		parentPath = append(parentPath, "..")
-	}
-	if buildSh == "" {
-		return "", fmt.Errorf("couldn't find %q; please cd into the local repository", buildShLocation)
-	}
-
-	cmd := exec.Command(buildSh)
-	if out, err := cmd.CombinedOutput(); err != nil {
-		return "", fmt.Errorf("error during build.sh execution: %v;\n%s", err, out)
-	}
-
-	return "cloud_sql_proxy", nil
-}
-
 // startProxy executes the cloud_sql_proxy via ssh. The returned ReadCloser
 // must be serviced and closed when finished, otherwise the SSH connection may
 // block.
@@ -410,24 +378,6 @@ func sshKey() (pubKey string, auth ssh.AuthMethod, err error) {
 	return string(ssh.MarshalAuthorizedKey(pub)), ssh.PublicKeys(signer), nil
 }
 
-func clientFromCredentials(ctx context.Context) (*http.Client, error) {
-	if f := *credentialFile; f != "" {
-		all, err := ioutil.ReadFile(f)
-		if err != nil {
-			return nil, fmt.Errorf("invalid json file %q: %v", f, err)
-		}
-		cfg, err := google.JWTConfigFromJSON(all, proxy.SQLScope)
-		if err != nil {
-			return nil, fmt.Errorf("invalid json file %q: %v", f, err)
-		}
-		return cfg.Client(ctx), nil
-	} else if tok := *token; tok != "" {
-		src := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: tok})
-		return oauth2.NewClient(ctx, src), nil
-	}
-	return google.DefaultClient(ctx, proxy.SQLScope)
-}
-
 func TestMain(m *testing.M) {
 	flag.Parse()
 	switch "" {

tests/common_open_source.go

@@ -0,0 +1,74 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tests
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy"
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
+)
+
+const buildShLocation = "cmd/cloud_sql_proxy/build.sh"
+
+func clientFromCredentials(ctx context.Context) (*http.Client, error) {
+	if f := *credentialFile; f != "" {
+		all, err := ioutil.ReadFile(f)
+		if err != nil {
+			return nil, fmt.Errorf("invalid json file %q: %v", f, err)
+		}
+		cfg, err := google.JWTConfigFromJSON(all, proxy.SQLScope)
+		if err != nil {
+			return nil, fmt.Errorf("invalid json file %q: %v", f, err)
+		}
+		return cfg.Client(ctx), nil
+	} else if tok := *token; tok != "" {
+		src := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: tok})
+		return oauth2.NewClient(ctx, src), nil
+	}
+	return google.DefaultClient(ctx, proxy.SQLScope)
+}
+
+func compileProxy() (string, error) {
+	// Find the 'build.sh' script by looking for it in cwd, cwd/.., and cwd/../..
+	var buildSh string
+
+	var parentPath []string
+	for parents := 0; parents < 2; parents++ {
+		cur := filepath.Join(append(parentPath, buildShLocation)...)
+		if _, err := os.Stat(cur); err == nil {
+			buildSh = cur
+			break
+		}
+		parentPath = append(parentPath, "..")
+	}
+	if buildSh == "" {
+		return "", fmt.Errorf("couldn't find %q; please cd into the local repository", buildShLocation)
+	}
+
+	cmd := exec.Command(buildSh)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		return "", fmt.Errorf("error during build.sh execution: %v;\n%s", err, out)
+	}
+
+	return "cloud_sql_proxy", nil
+}