fix tests after rebase

hashicorp · Jan 28, 2020 · dcd05df · dcd05df
1 parent 1a103f2
commit dcd05df
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/client.go b/client.go
@@ -40,12 +40,8 @@ func (c *Client) Get(ctx context.Context, req *Request) (*Operation, error) {
 	}
 
 	// Store this locally since there are cases we swap this
-	if req.Mode == ClientModeInvalid {
-		if req.Dir {
-			req.Mode = ClientModeDir
-		} else {
-			req.Mode = ClientModeFile
-		}
+	if req.Mode == ModeInvalid {
+		req.Mode = ModeAny
 	}
 
 	var err error

diff --git a/client_option_progress_test.go b/client_option_progress_test.go
@@ -54,7 +54,6 @@ func TestGet_progress(t *testing.T) {
 			Dst:              dst,
 			Src:              s.URL + "/file?thig=this&that",
 			ProgressListener: p,
-			Dir:              false,
 		}
 		if _, err := DefaultClient.Get(ctx, req); err != nil {
 			t.Fatalf("download failed: %v", err)
@@ -63,7 +62,6 @@ func TestGet_progress(t *testing.T) {
 			Dst:              dst,
 			Src:              s.URL + "/otherfile?thig=this&that",
 			ProgressListener: p,
-			Dir:              false,
 		}
 		if _, err := DefaultClient.Get(ctx, req); err != nil {
 			t.Fatalf("download failed: %v", err)

diff --git a/get_git.go b/get_git.go
@@ -28,7 +28,7 @@ type GitGetter struct {
 
 var defaultBranchRegexp = regexp.MustCompile(`\s->\sorigin/(.*)`)
 
-func (g *GitGetter) ClientMode(_ context.Context, u *url.URL) (ClientMode, error) {
+func (g *GitGetter) Mode(_ context.Context, u *url.URL) (Mode, error) {
 	return ModeDir, nil
 }
 

diff --git a/get_git_test.go b/get_git_test.go
@@ -409,7 +409,7 @@ func TestGitGetter_sshSCPStyle(t *testing.T) {
 		Dst: dst,
 		Pwd: ".",
 
-		Mode: ClientModeDir,
+		Mode: ModeDir,
 	}
 	client := &Client{
 		Detectors: []Detector{
@@ -452,7 +452,7 @@ func TestGitGetter_sshExplicitPort(t *testing.T) {
 		Dst: dst,
 		Pwd: ".",
 
-		Mode: ClientModeDir,
+		Mode: ModeDir,
 	}
 	client := &Client{
 
@@ -496,7 +496,7 @@ func TestGitGetter_sshSCPStyleInvalidScheme(t *testing.T) {
 		Dst: dst,
 		Pwd: ".",
 
-		Mode: ClientModeDir,
+		Mode: ModeDir,
 	}
 
 	client := &Client{

diff --git a/get_test.go b/get_test.go
@@ -753,8 +753,7 @@ func TestGetFile_inplace_badChecksum(t *testing.T) {
 	if err == nil {
 		t.Fatalf("err is nil")
 	}
-	_, ok := err.(*ChecksumError)
-	if ok == false {
+	if _, ok := err.(*ChecksumError); !ok {
 		t.Fatalf("err is not a checksum error: %v", err)
 	}
 	if op != nil {