add flay test fixes from #9516

gravitational · Jan 11, 2022 · 24e73bf · 24e73bf
1 parent 0ccd8f6
commit 24e73bf
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11 deletions.
diff --git a/lib/cache/cache_test.go b/lib/cache/cache_test.go
@@ -1820,8 +1820,11 @@ func TestCache_Backoff(t *testing.T) {
 			require.GreaterOrEqual(t, duration, stepMin)
 			require.LessOrEqual(t, duration, stepMax)
 
+			// wait for cache to get to retry.After
+			clock.BlockUntil(1)
+
 			// add some extra to the duration to ensure the retry occurs
-			clock.Advance(duration * 3)
+			clock.Advance(p.cache.MaxRetryPeriod)
 		case <-time.After(time.Minute):
 			t.Fatalf("timeout waiting for event")
 		}

diff --git a/lib/service/cfg.go b/lib/service/cfg.go
@@ -211,6 +211,9 @@ type Config struct {
 
 	// MaxRetryPeriod is the maximum period between reconnection attempts to auth
 	MaxRetryPeriod time.Duration
+
+	// ConnectFailureC is a channel to notify of failures to connect to auth (used in tests).
+	ConnectFailureC chan time.Duration
 }
 
 // ApplyToken assigns a given token to all internal services but only if token
@@ -292,7 +295,7 @@ type ProxyConfig struct {
 	// Enabled turns proxy role on or off for this process
 	Enabled bool
 
-	//DisableTLS is enabled if we don't want self-signed certs
+	// DisableTLS is enabled if we don't want self-signed certs
 	DisableTLS bool
 
 	// DisableWebInterface allows to turn off serving the Web UI interface
@@ -853,6 +856,7 @@ func ApplyDefaults(cfg *Config) {
 	cfg.Databases.Enabled = false
 
 	cfg.MaxRetryPeriod = defaults.MaxWatcherBackoff
+	cfg.ConnectFailureC = make(chan time.Duration, 1)
 }
 
 // ApplyFIPSDefaults updates default configuration to be FedRAMP/FIPS 140-2

diff --git a/lib/service/connect.go b/lib/service/connect.go
@@ -80,7 +80,7 @@ func (process *TeleportProcess) reconnectToAuthService(role teleport.Role) (*Con
 
 		// Used for testing that auth service will attempt to reconnect in the provided duration.
 		select {
-		case process.connectFailureC <- retry.Duration():
+		case process.Config.ConnectFailureC <- retry.Duration():
 		default:
 		}
 

diff --git a/lib/service/service.go b/lib/service/service.go
@@ -298,9 +298,6 @@ type TeleportProcess struct {
 
 	// clusterFeatures contain flags for supported and unsupported features.
 	clusterFeatures proto.Features
-
-	// connectFailureC is a channel to notify of failures to connect to auth (used in tests).
-	connectFailureC chan time.Duration
 }
 
 type keyPairKey struct {
@@ -671,7 +668,6 @@ func NewTeleport(cfg *Config) (*TeleportProcess, error) {
 		id:                  processID,
 		keyPairs:            make(map[keyPairKey]KeyPair),
 		appDependCh:         make(chan Event, 1024),
-		connectFailureC:     make(chan time.Duration),
 	}
 
 	process.registerAppDepend()

diff --git a/lib/service/service_test.go b/lib/service/service_test.go
@@ -462,6 +462,8 @@ func TestTeleportProcess_reconnectToAuth(t *testing.T) {
 	cfg.Auth.Enabled = false
 	cfg.Proxy.Enabled = false
 	cfg.SSH.Enabled = true
+	cfg.MaxRetryPeriod = defaults.MaxWatcherBackoff
+	cfg.ConnectFailureC = make(chan time.Duration, 5)
 	process, err := NewTeleport(cfg)
 	require.NoError(t, err)
 
@@ -478,14 +480,18 @@ func TestTeleportProcess_reconnectToAuth(t *testing.T) {
 	for i := 0; i < 5; i++ {
 		// wait for connection to fail
 		select {
-		case duration := <-process.connectFailureC:
+		case duration := <-process.Config.ConnectFailureC:
 			stepMin := step * time.Duration(i) / 2
 			stepMax := step * time.Duration(i+1)
 
 			require.GreaterOrEqual(t, duration, stepMin)
 			require.LessOrEqual(t, duration, stepMax)
+
+			// wait for connection to get to retry.After
+			clock.BlockUntil(1)
+
 			// add some extra to the duration to ensure the retry occurs
-			clock.Advance(duration * 3)
+			clock.Advance(cfg.MaxRetryPeriod)
 		case <-time.After(time.Minute):
 			t.Fatalf("timeout waiting for failure")
 		}

diff --git a/lib/services/proxywatcher_test.go b/lib/services/proxywatcher_test.go
@@ -53,7 +53,7 @@ func TestProxyWatcher_Backoff(t *testing.T) {
 		Clock:          clock,
 		MaxRetryPeriod: defaults.MaxWatcherBackoff,
 		Client:         &errorWatcher{},
-		ProxiesC:       make(chan []types.Server, 1),
+		ProxiesC:       make(chan []types.Server, 5),
 	})
 	require.NoError(t, err)
 	t.Cleanup(func() { require.NoError(t, w.Close()) })
@@ -68,8 +68,12 @@ func TestProxyWatcher_Backoff(t *testing.T) {
 
 			require.GreaterOrEqual(t, duration, stepMin)
 			require.LessOrEqual(t, duration, stepMax)
+
+			// wait for watcher to get to retry.After
+			clock.BlockUntil(1)
+
 			// add some extra to the duration to ensure the retry occurs
-			clock.Advance(duration * 3)
+			clock.Advance(w.MaxRetryPeriod)
 		case <-time.After(time.Minute):
 			t.Fatalf("timeout waiting for reset")
 		}