Merge pull request #2191 from dexidp/flaky-expiry-test

Quick fix flaky test

server/server_test.go

@@ -317,7 +317,8 @@ func makeOAuth2Tests(clientID string, clientSecret string, now func() time.Time)
 						return t1.Sub(t2) < within
 					}
 
-					if !timeEq(token.Expiry, expectedExpiry, time.Second) {
+					// TODO: This is a flaky test. We need something better (eg. clockwork).
+					if !timeEq(token.Expiry, expectedExpiry, 2*time.Second) {
 						return fmt.Errorf("expected expired_in to be %s, got %s", expectedExpiry, token.Expiry)
 					}