fix

Author: wxiaoguang

cmd/admin_user_change_password_test.go

@@ -9,6 +9,7 @@ import (
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

cmd/admin_user_create.go

@@ -135,7 +135,7 @@ func runCreateUser(ctx context.Context, c *cli.Command) error {
 	}
 
 	if !setting.IsInTesting {
-		// FIXME: need to refactor the "installSignals/initDB" related code later
+		// FIXME: need to refactor the "initDB" related code later
 		// it doesn't make sense to call it in (almost) every command action function
 		if err := initDB(ctx); err != nil {
 			return err

cmd/admin_user_delete.go

@@ -44,6 +44,7 @@ func microcmdUserDelete() *cli.Command {
 		Action: runDeleteUser,
 	}
 }
+
 func runDeleteUser(ctx context.Context, c *cli.Command) error {
 	if !c.IsSet("id") && !c.IsSet("username") && !c.IsSet("email") {
 		return errors.New("You must provide the id, username or email of a user to delete")

cmd/admin_user_delete_test.go

@@ -44,7 +44,6 @@ func TestAdminUserDelete(t *testing.T) {
 		err := microcmdUserDelete().Run(ctx, []string{"delete-test", "--username", "testuser"})
 		require.NoError(t, err)
 		unittest.AssertNotExistsBean(t, &user_model.User{LowerName: "testuser"})
-
 	})
 	t.Run("delete user by email", func(t *testing.T) {
 		setupTestUser(t)

cmd/admin_user_must_change_password_test.go

@@ -9,6 +9,7 @@ import (
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

contrib/backport/backport.go

@@ -12,11 +12,9 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
-	"os/signal"
 	"path"
 	"strconv"
 	"strings"
-	"syscall"
 
 	"github.com/google/go-github/v71/github"
 	"github.com/urfave/cli/v3"
@@ -105,9 +103,7 @@ OPTIONS:
 `
 
 	app.Action = runBackport
-	ctx, cancel := installSignals()
-	defer cancel()
-	if err := app.Run(ctx, os.Args); err != nil {
+	if err := app.Run(context.Background(), os.Args); err != nil {
 		fmt.Fprintf(os.Stderr, "Unable to backport: %v\n", err)
 	}
 }
@@ -458,25 +454,3 @@ func determineSHAforPR(ctx context.Context, prStr, accessToken string) (string,
 
 	return "", nil
 }
-
-func installSignals() (context.Context, context.CancelFunc) {
-	ctx, cancel := context.WithCancel(context.Background())
-	go func() {
-		// install notify
-		signalChannel := make(chan os.Signal, 1)
-
-		signal.Notify(
-			signalChannel,
-			syscall.SIGINT,
-			syscall.SIGTERM,
-		)
-		select {
-		case <-signalChannel:
-		case <-ctx.Done():
-		}
-		cancel()
-		signal.Reset()
-	}()
-
-	return ctx, cancel
-}