Add Context cancellation to clock.

common/clock/testclock/testclock_test.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package testclock
 
 import (
         "testing"
         "time"
 
         "github.com/luci/luci-go/common/clock"
         . "github.com/smartystreets/goconvey/convey"
+        "golang.org/x/net/context"
 )
 
+// trashTimer is a useless implementation of clock.Timer specifically designed
+// to exist and not be a test timer type.

[iannucci, 2016/02/10 22:30:28]

move into testTimer_test.go.test.tester.go

[dnj (Google), 2016/02/11 01:26:54]

Done.

+type trashTimer struct {
+        clock.Timer
+}
+
 func TestTestClock(t *testing.T) {
         t.Parallel()
 
         Convey(`A testing clock instance`, t, func() {
                 now := time.Date(2015, 01, 01, 00, 00, 00, 00, time.UTC)
-                c := New(now)
+                ctx, clk := UseTime(context.Background(), now)
 
                 Convey(`Returns the current time.`, func() {
-                        So(c.Now(), ShouldResemble, now)
+                        So(clk.Now(), ShouldResemble, now)
                 })
 
                 Convey(`When sleeping with a time of zero, immediately awakens.`, func() {
-                        c.Sleep(0)
-                        So(c.Now(), ShouldResemble, now)
+                        clk.Sleep(ctx, 0)
+                        So(clk.Now(), ShouldResemble, now)
+                })
+
+                Convey(`Will panic if going backwards in time.`, func() {
+                        So(func() { clk.Add(-1 * time.Second) }, ShouldPanic)
                 })
 
                 Convey(`When sleeping for a period of time, awakens when signalled.`, func() {
                         sleepingC := make(chan struct{})
-                        c.SetTimerCallback(func(_ time.Duration, _ clock.Timer) {
+                        clk.SetTimerCallback(func(_ time.Duration, _ clock.Timer) {
                                 close(sleepingC)
                         })
 
                         awakeC := make(chan time.Time)
                         go func() {
-                                c.Sleep(2 * time.Second)
-                                awakeC <- c.Now()
+                                clk.Sleep(ctx, 2*time.Second)
+                                awakeC <- clk.Now()
                         }()
 
                         <-sleepingC
-                        c.Set(now.Add(1 * time.Second))
-                        c.Set(now.Add(2 * time.Second))
+                        clk.Set(now.Add(1 * time.Second))
+                        clk.Set(now.Add(2 * time.Second))
                         So(<-awakeC, ShouldResemble, now.Add(2*time.Second))
                 })
 
                 Convey(`Awakens after a period of time.`, func() {
-                        afterC := c.After(2 * time.Second)
+                        afterC := clk.After(ctx, 2*time.Second)
 
-                        c.Set(now.Add(1 * time.Second))
-                        c.Set(now.Add(2 * time.Second))
-                        So(<-afterC, ShouldResemble, now.Add(2*time.Second))
+                        clk.Set(now.Add(1 * time.Second))
+                        clk.Set(now.Add(2 * time.Second))
+                        So(<-afterC, ShouldResemble, clock.TimerResult{now.Add(2 * time.Second), nil})
+                })
+
+                Convey(`When sleeping, awakens if canceled.`, func() {
+                        ctx, cancelFunc := context.WithCancel(ctx)
+
+                        clk.SetTimerCallback(func(_ time.Duration, _ clock.Timer) {
+                                cancelFunc()
+                        })
+
+                        So(clk.Sleep(ctx, time.Second), ShouldEqual, context.Canceled)
                 })
         })
 }