Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions actors.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,15 @@ func (e SignalError) Is(err error) bool {
}

// As fixes a design error in the SignalError type, so that errors.As with the
// literal `&SignalError{}` will return true.
// literal `&SignalError{}` will return true and, per the errors.As contract,
// populate target with the underlying signal.
func (e SignalError) As(target interface{}) bool {
switch target.(type) {
case *SignalError, SignalError:
return true
default:
t, ok := target.(*SignalError)
if !ok {
return false
}
*t = e
return true
}

// ErrSignal is returned by SignalHandler when a signal triggers termination.
Expand Down
21 changes: 21 additions & 0 deletions actors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,27 @@ func TestSignalError(t *testing.T) {
}
}

// errors.As must populate a value-typed SignalError target, not merely
// report a match; #27 made it return true without ever assigning.
func TestSignalErrorAsAssignsTarget(t *testing.T) {
testc := make(chan os.Signal, 1)
ctx := putTestSigChan(context.Background(), testc)

var rg Group
rg.Add(SignalHandler(ctx, os.Interrupt))
testc <- os.Interrupt
err := rg.Run()

var target SignalError
if want, have := true, errors.As(err, &target); want != have {
t.Fatalf("errors.As(err, &target): want %v, have %v", want, have)
}

if want, have := os.Interrupt, target.Signal; want != have {
t.Errorf("target.Signal: want %v, have %v (errors.As reported success but did not assign the target)", want, have)
}
}

func TestSignalHandlerNil(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
var rg Group
Expand Down