From 6e2b69acf19776eaeed873c9ca2c17f950f9adc3 Mon Sep 17 00:00:00 2001 From: Sasha Klizhentas Date: Sun, 12 Mar 2017 12:23:51 -0700 Subject: [PATCH 1/2] fix retrieval TTL --- lib/services/local/users.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/services/local/users.go b/lib/services/local/users.go index 69669afb8b7d0..2af9003ef9c41 100644 --- 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) } From 9141f94b8d558865dbecfd4074e049558ded6b32 Mon Sep 17 00:00:00 2001 From: Sasha Klizhentas Date: Sun, 12 Mar 2017 12:28:31 -0700 Subject: [PATCH 2/2] fix flaky test --- lib/utils/timeout_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utils/timeout_test.go b/lib/utils/timeout_test.go index d1b00b1bdf024..c0a5fadf680da 100644 --- 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$")