Imported Upstream version 2011-02-01.1upstream/2011-02-01.1

1 files changed, 15 insertions, 2 deletions

diff --git a/src/pkg/time/tick_test.go b/src/pkg/time/tick_test.go
index 2a63a0f2b..4dcb63956 100644
--- a/src/pkg/time/tick_test.go
+++ b/src/pkg/time/tick_test.go
@@ -29,9 +29,11 @@ func TestTicker(t *testing.T) {
 	}
 	// Now test that the ticker stopped
 	Sleep(2 * Delta)
-	_, received := <-ticker.C
-	if received {
+	select {
+	case <-ticker.C:
 		t.Fatal("Ticker did not shut down")
+	default:
+		// ok
 	}
 }
 
@@ -43,3 +45,14 @@ func TestTeardown(t *testing.T) {
 		ticker.Stop()
 	}
 }
+
+func BenchmarkTicker(b *testing.B) {
+	ticker := NewTicker(1)
+	b.ResetTimer()
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		<-ticker.C
+	}
+	b.StopTimer()
+	ticker.Stop()
+}