- fix tests

lib/download_test.go

@@ -6,14 +6,15 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"sync"
 	"testing"
 
 	"github.com/mitchellh/go-homedir"
 )
 
 // TestDownloadFromURL_FileNameMatch : Check expected filename exist when downloaded
 func TestDownloadFromURL_FileNameMatch(t *testing.T) {
-
+	logger = InitLogger("DEBUG")
 	hashiURL := "https://releases.hashicorp.com/terraform/"
 	installVersion := "terraform_"
 	tempDir := t.TempDir()
@@ -46,10 +47,11 @@ func TestDownloadFromURL_FileNameMatch(t *testing.T) {
 
 	/* test download old terraform version */
 	lowestVersion := "0.11.0"
-
+	var wg sync.WaitGroup
+	defer wg.Done()
 	urlToDownload := hashiURL + lowestVersion + "/" + installVersion + lowestVersion + macOS
 	expectedFile := filepath.Join(installLocation, installVersion+lowestVersion+macOS)
-	installedFile, errDownload := downloadFromURL(installLocation, urlToDownload, nil)
+	installedFile, errDownload := downloadFromURL(installLocation, urlToDownload, &wg)
 
 	if errDownload != nil {
 		t.Logf("Expected file name %v to be downloaded", expectedFile)

lib/param_parsing/parameters_test.go

@@ -43,6 +43,9 @@ func TestGetParameters_params_are_overridden_by_toml_file(t *testing.T) {
 	if actual != expected {
 		t.Error("Version Param was not as expected. Actual: " + actual + ", Expected: " + expected)
 	}
+	t.Cleanup(func() {
+		getopt.CommandLine = getopt.New()
+	})
 }
 
 func TestGetParameters_toml_params_are_overridden_by_cli(t *testing.T) {
@@ -65,14 +68,16 @@ func TestGetParameters_toml_params_are_overridden_by_cli(t *testing.T) {
 	if actual != expected {
 		t.Error("Version Param was not as expected. Actual: " + actual + ", Expected: " + expected)
 	}
+	t.Cleanup(func() {
+		getopt.CommandLine = getopt.New()
+	})
 }
 
 func TestGetParameters_dry_run_wont_download_anything(t *testing.T) {
 	logger = lib.InitLogger("DEBUG")
 	installLocation := lib.GetInstallLocation()
 	expected := "../../test-data/integration-tests/test_versiontf"
-	//os.Args = []string{"cmd", "--chdir=" + expected, "--bin=/tmp", "--dry-run"}
-	os.Args = []string{"cmd", "--log-level=DEBUG", "--chdir=" + expected, "--bin=/tmp"}
+	os.Args = []string{"cmd", "--chdir=" + expected, "--bin=/tmp", "--dry-run"}
 	params := GetParameters()
 	installFileVersionPath := lib.ConvertExecutableExt(filepath.Join(installLocation, lib.VersionPrefix+params.Version))
 	// Make sure the file tfswitch WOULD download is absent
@@ -81,6 +86,9 @@ func TestGetParameters_dry_run_wont_download_anything(t *testing.T) {
 	if lib.FileExistsAndIsNotDir(installFileVersionPath) {
 		t.Error("Dry run should NOT download any files.")
 	}
+	t.Cleanup(func() {
+		getopt.CommandLine = getopt.New()
+	})
 }
 
 func TestGetParameters_check_config_precedence(t *testing.T) {
@@ -94,4 +102,7 @@ func TestGetParameters_check_config_precedence(t *testing.T) {
 	if parameters.Version != expected {
 		t.Error("Version Param was not as expected. Actual: " + parameters.Version + ", Expected: " + expected)
 	}
+	t.Cleanup(func() {
+		getopt.CommandLine = getopt.New()
+	})
 }