use strings.Contains & time.Since

benchmark.go

@@ -72,7 +72,7 @@ func (c *C) StartTimer() {
 // want to measure.
 func (c *C) StopTimer() {
 	if c.timerOn {
-		c.duration += time.Now().Sub(c.start)
+		c.duration += time.Since(c.start)
 		c.timerOn = false
 		runtime.ReadMemStats(&memStats)
 		c.netAllocs += memStats.Mallocs - c.startAllocs

bootstrap_test.go

@@ -64,7 +64,7 @@ func (s *BootstrapS) TestLogfAndGetTestLog(c *check.C) {
 func (s *BootstrapS) TestRunShowsErrors(c *check.C) {
 	output := String{}
 	check.Run(&FailHelper{}, &check.RunConf{Output: &output})
-	if strings.Index(output.value, "Expected failure!") == -1 {
+	if !strings.Contains(output.value, "Expected failure!") {
 		critical(fmt.Sprintf("RunWithWriter() output did not contain the "+
 			"expected failure! Got: %#v",
 			output.value))
@@ -74,7 +74,7 @@ func (s *BootstrapS) TestRunShowsErrors(c *check.C) {
 func (s *BootstrapS) TestRunDoesntShowSuccesses(c *check.C) {
 	output := String{}
 	check.Run(&SuccessHelper{}, &check.RunConf{Output: &output})
-	if strings.Index(output.value, "Expected success!") != -1 {
+	if strings.Contains(output.value, "Expected success!") {
 		critical(fmt.Sprintf("RunWithWriter() output contained a successful "+
 			"test! Got: %#v",
 			output.value))

foundation_test.go

@@ -99,7 +99,7 @@ func (s *FoundationS) TestFailureHeader(c *check.C) {
 		"-----------------------------------\n"+
 		"FAIL: check_test.go:%d: FailHelper.TestLogAndFail\n",
 		failHelper.testLine)
-	if strings.Index(output.value, header) == -1 {
+	if !strings.Contains(output.value, header) {
 		c.Errorf(""+
 			"Failure didn't print a proper header.\n"+
 			"... Got:\n%s... Expected something with:\n%s",

helpers.go

@@ -99,7 +99,7 @@ func (c *C) Logf(format string, args ...interface{}) {
 // Output enables *C to be used as a logger in functions that require only
 // the minimum interface of *log.Logger.
 func (c *C) Output(calldepth int, s string) error {
-	d := time.Now().Sub(c.startTime)
+	d := time.Since(c.startTime)
 	msec := d / time.Millisecond
 	sec := d / time.Second
 	min := d / time.Minute