Explorar o código

Merge pull request #40496 from thaJeztah/locally_scope_variable

TestCatchAll, TestStopCatch: remove unneeded goroutine
Akihiro Suda %!s(int64=5) %!d(string=hai) anos
pai
achega
ff9fa7b43a
Modificáronse 1 ficheiros con 3 adicións e 14 borrados
  1. 3 14
      pkg/signal/signal_linux_test.go

+ 3 - 14
pkg/signal/signal_linux_test.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"syscall"
 	"testing"
-	"time"
 
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
@@ -27,17 +26,11 @@ func TestCatchAll(t *testing.T) {
 	}
 
 	for sigStr := range listOfSignals {
-		signal, ok := SignalMap[sigStr]
-		if ok {
-			go func() {
-				time.Sleep(1 * time.Millisecond)
-				syscall.Kill(syscall.Getpid(), signal)
-			}()
-
+		if signal, ok := SignalMap[sigStr]; ok {
+			syscall.Kill(syscall.Getpid(), signal)
 			s := <-sigs
 			assert.Check(t, is.Equal(s.String(), signal.String()))
 		}
-
 	}
 }
 
@@ -45,11 +38,7 @@ func TestStopCatch(t *testing.T) {
 	signal := SignalMap["HUP"]
 	channel := make(chan os.Signal, 1)
 	CatchAll(channel)
-	go func() {
-
-		time.Sleep(1 * time.Millisecond)
-		syscall.Kill(syscall.Getpid(), signal)
-	}()
+	syscall.Kill(syscall.Getpid(), signal)
 	signalString := <-channel
 	assert.Check(t, is.Equal(signalString.String(), signal.String()))