Use Until instead of Sub in WithDeadline

morigs · morigs · commit 3e4357c3031e · 2021-11-12T16:08:22.000+03:00
diff --git a/context.go b/context.go
@@ -18,7 +18,7 @@ func (m *Mock) WithDeadline(parent context.Context, deadline time.Time) (context
 	}
 	ctx := &timerCtx{clock: m, parent: parent, deadline: deadline, done: make(chan struct{})}
 	propagateCancel(parent, ctx)
-	dur := deadline.Sub(m.Now())
+	dur := m.Until(deadline)
 	if dur <= 0 {
 		ctx.cancel(context.DeadlineExceeded) // deadline has already passed
 		return ctx, func() { ctx.cancel(context.Canceled) }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func (m *Mock) WithDeadline(parent context.Context, deadline time.Time) (context`
`18`	`18`	`}`
`19`	`19`	`ctx := &timerCtx{clock: m, parent: parent, deadline: deadline, done: make(chan struct{})}`
`20`	`20`	`propagateCancel(parent, ctx)`
`21`		`- dur := deadline.Sub(m.Now())`
	`21`	`+ dur := m.Until(deadline)`
`22`	`22`	`if dur <= 0 {`
`23`	`23`	`ctx.cancel(context.DeadlineExceeded) // deadline has already passed`
`24`	`24`	`return ctx, func() { ctx.cancel(context.Canceled) }`