From 5a3e98b529be462209badd511f2686fa6de8ee0f Mon Sep 17 00:00:00 2001
From: Ali Rizvi-Santiago <arizvisa@gmail.com>
Date: Wed, 3 Jan 2018 20:31:49 -0600
Subject: [PATCH] Updated the testcases in common/download_test.go to pass a
 non-nil progress-bar due to the removal of a pointer type in commit
 ed2e341b7d7f49a063dd5018701b4ae548b8ec14 from yesterday.

---
 common/download.go      | 15 +++++++++++++--
 common/download_test.go | 24 +++++++++++++-----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/common/download.go b/common/download.go
index e5ebe305f..cfa2d8849 100644
--- a/common/download.go
+++ b/common/download.go
@@ -516,9 +516,20 @@ func (d *FileDownloader) toPath(base string, uri url.URL) (string, error) {
 		result = path.Join(uri.Host, uri.Path)
 
 		// semi-absolute path (current drive letter)
-		//	-- file:///absolute/path -> /absolute/path
+		//	-- file:///absolute/path -> drive:/absolute/path
 	} else if uri.Host == "" && strings.HasPrefix(uri.Path, "/") {
-		result = path.Join(filepath.VolumeName(base), uri.Path)
+		apath := uri.Path
+		components := strings.Split(apath, "/")
+		volume := filepath.VolumeName(base)
+
+		// semi-absolute absolute path (includes volume letter)
+		// -- file://drive:/path -> drive:/absolute/path
+		if len(components) > 1 && strings.HasSuffix(components[1], ":") {
+			volume = components[1]
+			apath = path.Join(components[2:]...)
+		}
+
+		result = path.Join(volume, apath)
 
 		// relative path -- file://./relative/path -> ./relative/path
 	} else if uri.Host == "." {
diff --git a/common/download_test.go b/common/download_test.go
index 50bdfa971..db31fe152 100644
--- a/common/download_test.go
+++ b/common/download_test.go
@@ -12,6 +12,8 @@ import (
 	"runtime"
 	"strings"
 	"testing"
+
+	"github.com/cheggaaa/pb"
 )
 
 func TestDownloadClientVerifyChecksum(t *testing.T) {
@@ -36,7 +38,7 @@ func TestDownloadClientVerifyChecksum(t *testing.T) {
 		Checksum: checksum,
 	}
 
-	d := NewDownloadClient(config, nil)
+	d := NewDownloadClient(config, *pb.New64(0))
 	result, err := d.VerifyChecksum(tf.Name())
 	if err != nil {
 		t.Fatalf("Verify err: %s", err)
@@ -59,7 +61,7 @@ func TestDownloadClient_basic(t *testing.T) {
 		Url:        ts.URL + "/basic.txt",
 		TargetPath: tf.Name(),
 		CopyFile:   true,
-	}, nil)
+	}, *pb.New64(0))
 
 	path, err := client.Get()
 	if err != nil {
@@ -95,7 +97,7 @@ func TestDownloadClient_checksumBad(t *testing.T) {
 		Hash:       HashForType("md5"),
 		Checksum:   checksum,
 		CopyFile:   true,
-	}, nil)
+	}, *pb.New64(0))
 	if _, err := client.Get(); err == nil {
 		t.Fatal("should error")
 	}
@@ -120,7 +122,7 @@ func TestDownloadClient_checksumGood(t *testing.T) {
 		Hash:       HashForType("md5"),
 		Checksum:   checksum,
 		CopyFile:   true,
-	}, nil)
+	}, *pb.New64(0))
 	path, err := client.Get()
 	if err != nil {
 		t.Fatalf("err: %s", err)
@@ -151,7 +153,7 @@ func TestDownloadClient_checksumNoDownload(t *testing.T) {
 		Hash:       HashForType("md5"),
 		Checksum:   checksum,
 		CopyFile:   true,
-	}, nil)
+	}, *pb.New64(0))
 	path, err := client.Get()
 	if err != nil {
 		t.Fatalf("err: %s", err)
@@ -190,7 +192,7 @@ func TestDownloadClient_resume(t *testing.T) {
 		Url:        ts.URL,
 		TargetPath: tf.Name(),
 		CopyFile:   true,
-	}, nil)
+	}, *pb.New64(0))
 	path, err := client.Get()
 	if err != nil {
 		t.Fatalf("err: %s", err)
@@ -250,7 +252,7 @@ func TestDownloadClient_usesDefaultUserAgent(t *testing.T) {
 		CopyFile:   true,
 	}
 
-	client := NewDownloadClient(config, nil)
+	client := NewDownloadClient(config, *pb.New64(0))
 	_, err = client.Get()
 	if err != nil {
 		t.Fatal(err)
@@ -282,7 +284,7 @@ func TestDownloadClient_setsUserAgent(t *testing.T) {
 		CopyFile:   true,
 	}
 
-	client := NewDownloadClient(config, nil)
+	client := NewDownloadClient(config, *pb.New64(0))
 	_, err = client.Get()
 	if err != nil {
 		t.Fatal(err)
@@ -381,12 +383,12 @@ func TestDownloadFileUrl(t *testing.T) {
 		CopyFile: false,
 	}
 
-	client := NewDownloadClient(config, nil)
+	client := NewDownloadClient(config, *pb.New64(0))
 
 	// Verify that we fail to match the checksum
 	_, err = client.Get()
 	if err.Error() != "checksums didn't match expected: 6e6f7065" {
-		t.Fatalf("Unexpected failure; expected checksum not to match")
+		t.Fatalf("Unexpected failure; expected checksum not to match. Error was \"%v\"", err)
 	}
 
 	if _, err = os.Stat(sourcePath); err != nil {
@@ -412,7 +414,7 @@ func SimulateFileUriDownload(t *testing.T, uri string) (string, error) {
 	}
 
 	// go go go
-	client := NewDownloadClient(config, nil)
+	client := NewDownloadClient(config, *pb.New64(0))
 	path, err := client.Get()
 
 	// ignore any non-important checksum errors if it's not a unc path