fixing golang install tests

mr-pmillz · Jun 9, 2022 · 0969e4d · 0969e4d
1 parent 8384be9
commit 0969e4d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/extra/extra.go b/extra/extra.go
@@ -32,10 +32,6 @@ func InstallExtraPackages(osType string, dirs *localio.Directories, packages *lo
 		if err := localio.BrewInstallProgram("gnu-sed", "gsed", packages); err != nil {
 			return err
 		}
-		// install gotop
-		//if err := localio.BrewInstallProgram("gotop", "gotop", packages); err != nil {
-		//	return err
-		//}
 		// install yamllint
 		if err := localio.BrewInstallProgram("yamllint", "yamllint", packages); err != nil {
 			return err
@@ -106,15 +102,6 @@ func InstallExtraPackages(osType string, dirs *localio.Directories, packages *lo
 				return err
 			}
 		}
-		// install gotop
-		//if _, exists := localio.CommandExists("go"); exists {
-		//	if _, exists = localio.CommandExists("gotop"); !exists {
-		//		if err := localio.RunCommandPipeOutput("go install github.com/xxxserxxx/gotop/v4/cmd/gotop@latest"); err != nil {
-		//			return err
-		//		}
-		//	}
-		//}
-
 		// install cowsay, bat, fd-find
 		if err := localio.AptInstall(packages, "cowsay", "bat", "fd-find"); err != nil {
 			return err

diff --git a/extra/extra_test.go b/extra/extra_test.go
@@ -13,10 +13,16 @@ func TestInstallExtraPackages(t *testing.T) {
 	if err != nil {
 		t.Errorf("failed to create Directories type: %v", err)
 	}
+
 	osType := runtime.GOOS
 	switch osType {
 	case "linux":
-		if err = localio.DownloadAndInstallLatestVersionOfGolang(dirs.HomeDir); err != nil {
+		packages, err := localio.NewAptInstalled()
+		if err != nil {
+			t.Errorf("failed to get AptInstalledPackages: %v", err)
+		}
+
+		if err = localio.DownloadAndInstallLatestVersionOfGolang(dirs.HomeDir, packages); err != nil {
 			t.Errorf("couldn't download and install golang: %v", err)
 		}
 		if err = localio.RunCommandPipeOutput("go version"); err != nil {

diff --git a/localio/localio_test.go b/localio/localio_test.go
@@ -123,19 +123,24 @@ func TestDownloadAndInstallLatestVersionOfGolang(t *testing.T) {
 	if err != nil {
 		t.Errorf("failed to create Directories type: %v", err)
 	}
+	pkgs, err := NewAptInstalled()
+	if err != nil {
+		t.Errorf("failed to get AptInstalledPackages: %v", err)
+	}
 	type args struct {
-		homeDir string
+		homeDir  string
+		packages *InstalledPackages
 	}
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
-		{name: "TestDownloadAndInstallLatestVersionOfGolang 1", args: args{homeDir: dirs.HomeDir}, wantErr: false},
+		{name: "TestDownloadAndInstallLatestVersionOfGolang 1", args: args{homeDir: dirs.HomeDir, packages: pkgs}, wantErr: false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := DownloadAndInstallLatestVersionOfGolang(tt.args.homeDir); (err != nil) != tt.wantErr {
+			if err := DownloadAndInstallLatestVersionOfGolang(tt.args.homeDir, tt.args.packages); (err != nil) != tt.wantErr {
 				t.Errorf("DownloadAndInstallLatestVersionOfGolang() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})