fixup! internal/cmd/update.go: handle windows-specific behaviours

johnstcn · johnstcn · commit e064c47bbecd · 2021-08-17T10:31:59.000Z
diff --git a/internal/cmd/update.go b/internal/cmd/update.go
@@ -218,7 +218,7 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLArg string, versi
 
 func (u *updater) doUpdate(ctx context.Context, updatedCoderBinaryPath string) error {
 	var err error
-	// TODO(cian): on Windows, we must do two things differnetly:
+	// TODO(cian): on Windows, we must do two things differently:
 	// 1) Calling the updated binary fails due to the xterminal.MakeOutputRaw call in main; skipping this check on Windows.
 	// 2) We must rename the currently running binary before renaming the new binary
 	if u.osF() == goosWindows {
diff --git a/internal/cmd/update_test.go b/internal/cmd/update_test.go
@@ -71,34 +71,36 @@ func Test_updater_run(t *testing.T) {
 	}
 
 	run := func(t *testing.T, name string, fn func(t *testing.T, p *params)) {
-		t.Logf("running %s", name)
-		ctx := context.Background()
-		fakefs := afero.NewMemMapFs()
-		execer := newFakeExecer(t)
-		execer.M["brew --prefix"] = fakeExecerResult{[]byte{}, os.ErrNotExist}
-		params := &params{
-			// This must be overridden inside run()
-			ConfirmF: func(string) (string, error) {
-				t.Errorf("unhandled ConfirmF")
-				t.FailNow()
-				return "", nil
-			},
-			Execer:         execer,
-			Ctx:            ctx,
-			ExecutablePath: fakeExePathLinux,
-			Fakefs:         fakefs,
-			HTTPClient:     newFakeGetter(t),
-			// Default to GOOS=linux
-			OsF: func() string { return goosLinux },
-			// This must be overridden inside run()
-			VersionF: func() string {
-				t.Errorf("unhandled VersionF")
-				t.FailNow()
-				return ""
-			},
-		}
-
-		fn(t, params)
+		t.Run(name, func(t *testing.T) {
+			t.Logf("running %s", name)
+			ctx := context.Background()
+			fakefs := afero.NewMemMapFs()
+			execer := newFakeExecer(t)
+			execer.M["brew --prefix"] = fakeExecerResult{[]byte{}, os.ErrNotExist}
+			params := &params{
+				// This must be overridden inside run()
+				ConfirmF: func(string) (string, error) {
+					t.Errorf("unhandled ConfirmF")
+					t.FailNow()
+					return "", nil
+				},
+				Execer:         execer,
+				Ctx:            ctx,
+				ExecutablePath: fakeExePathLinux,
+				Fakefs:         fakefs,
+				HTTPClient:     newFakeGetter(t),
+				// Default to GOOS=linux
+				OsF: func() string { return goosLinux },
+				// This must be overridden inside run()
+				VersionF: func() string {
+					t.Errorf("unhandled VersionF")
+					t.FailNow()
+					return ""
+				},
+			}
+
+			fn(t, params)
+		})
 	}
 
 	run(t, "update coder - noop", func(t *testing.T, p *params) {
