Merge pull request #830 from gravitational/sasha/ttl

fix retrieval TTL
gravitational · Mar 12, 2017 · 52d097d · 52d097d
2 parents 0a8741e + 9141f94
commit 52d097d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/services/local/users.go b/lib/services/local/users.go
@@ -637,7 +637,11 @@ func (s *IdentityService) GetOIDCConnectors(withSecrets bool) ([]services.OIDCCo
 	for _, id := range connectorIDs {
 		connector, err := s.GetOIDCConnector(id, withSecrets)
 		if err != nil {
-			return nil, trace.Wrap(err)
+			if !trace.IsNotFound(err) {
+				return nil, trace.Wrap(err)
+			}
+			// the record has expired
+			continue
 		}
 		connectors = append(connectors, connector)
 	}

diff --git a/lib/utils/timeout_test.go b/lib/utils/timeout_test.go
@@ -62,7 +62,7 @@ func (s *TimeoutSuite) TearDownSuite(c *check.C) {
 
 func (s *TimeoutSuite) TestSlowOperation(c *check.C) {
 	client := newClient(time.Millisecond * 5)
-	_, err := client.Get(s.server.URL + "/slow?delay=10ms")
+	_, err := client.Get(s.server.URL + "/slow?delay=20ms")
 	// must fail with I/O timeout
 	c.Assert(err, check.NotNil)
 	c.Assert(err.Error(), check.Matches, "^.*i/o timeout$")