Add a function for expecting a panic.

.travis.yml

@@ -16,6 +16,8 @@ matrix:
     - go: 1.5
     - go: 1.6
     - go: 1.7
+    - go: 1.8
+    - go: 1.9
       env: FMT_AND_VET=1
     - go: tip
 
@@ -34,4 +36,4 @@ script:
   - test "$FMT_AND_VET" != 1 || go test -v -race .
 
 after_script:
- - test "$FMT_AND_VET" != 1 || $HOME/gopath/bin/goveralls -coverprofile=/tmp/coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN
+ - test "$FMT_AND_VET" != 1 || $HOME/gopath/bin/goveralls -coverprofile=/tmp/coverage.out -service=travis-ci -repotoken=$COVERALLS_TOKEN

expect.go

@@ -94,3 +94,20 @@ func (t *T) ExpectErrorMessagef(err error, msg string, spec string, args ...inte
 			"Error message=%s\nExpected string=%s", prefix, err.Error(), msg)
 	}
 }
+
+// Expects the function passed in to panic. This will call f() and expect
+// that an error matching err will be raised as a panic.
+func (t *T) ExpectPanic(f func(), err interface{}, desc ...string) {
+	prefix := ""
+	if len(desc) > 0 {
+		prefix = strings.Join(desc, " ") + ": "
+	}
+	defer func() {
+		i := recover()
+		if i == nil {
+			t.Fatalf("%sFunction call did not panic as expected.", prefix)
+		}
+		t.Equal(i, err, "Raised value is not correct")
+	}()
+	f()
+}

expect_test.go

@@ -149,3 +149,17 @@ func TestT_ExpectErrorMessagef(t *testing.T) {
 		T.ExpectErrorMessage(fmt.Errorf("XXX"), "XXX")
 	})
 }
+
+func TestT_ExpectErrorPanic(t *testing.T) {
+	t.Parallel()
+	m, T := testSetup()
+
+	m.CheckPass(t, func() {
+		T.ExpectPanic(func() {
+			panic("EXPECTED")
+		}, "EXPECTED", "prefix: ")
+	})
+	m.CheckFail(t, func() {
+		T.ExpectPanic(func() {}, "UNEXPECTED")
+	})
+}

timeout_test.go

@@ -74,17 +74,18 @@ func TestT_TryUntilYield(t *testing.T) {
 	l := sync.Mutex{}
 	unlocked := false
 	go func() {
-		time.Sleep(time.Second / 200)
+		time.Sleep(time.Second / 100)
 		l.Lock()
 		unlocked = true
 		l.Unlock()
 	}()
 	getUnlocked := func() bool {
 		l.Lock()
 		defer l.Unlock()
+		time.Sleep(time.Millisecond)
 		return unlocked
 	}
 	m.CheckPass(t, func() {
-		T.TryUntil(getUnlocked, time.Second/50)
+		T.TryUntil(getUnlocked, time.Second)
 	})
 }