[MM-60685] Fix racy TestSyncLdap (#28324)

server/channels/app/app_iface.go

@@ -352,7 +352,7 @@ type AppIface interface {
 	// SyncLdap starts an LDAP sync job.
 	// If includeRemovedMembers is true, then members who left or were removed from a team/channel will
 	// be re-added; otherwise, they will not be re-added.
-	SyncLdap(c request.CTX, includeRemovedMembers bool)
+	SyncLdap(rctx request.CTX, includeRemovedMembers bool)
 	// SyncPlugins synchronizes the plugins installed locally
 	// with the plugin bundles available in the file store.
 	SyncPlugins() *model.AppError

server/channels/app/ldap.go

@@ -17,20 +17,21 @@ import (
 // SyncLdap starts an LDAP sync job.
 // If includeRemovedMembers is true, then members who left or were removed from a team/channel will
 // be re-added; otherwise, they will not be re-added.
-func (a *App) SyncLdap(c request.CTX, includeRemovedMembers bool) {
+func (a *App) SyncLdap(rctx request.CTX, includeRemovedMembers bool) {
+	rctx = rctx.Clone()
 	a.Srv().Go(func() {
 		if license := a.Srv().License(); license != nil && *license.Features.LDAP {
 			if !*a.Config().LdapSettings.EnableSync {
-				c.Logger().Error("LdapSettings.EnableSync is set to false. Skipping LDAP sync.")
+				rctx.Logger().Error("LdapSettings.EnableSync is set to false. Skipping LDAP sync.")
 				return
 			}
 
 			ldapI := a.Ldap()
 			if ldapI == nil {
-				c.Logger().Error("Not executing ldap sync because ldap is not available")
+				rctx.Logger().Error("Not executing ldap sync because ldap is not available")
 				return
 			}
-			ldapI.StartSynchronizeJob(c, false, includeRemovedMembers)
+			ldapI.StartSynchronizeJob(rctx, false, includeRemovedMembers)
 		}
 	})
 }

server/channels/app/opentracing/opentracing_layer.go

@@ -17464,7 +17464,7 @@ func (a *OpenTracingAppLayer) SwitchOAuthToEmail(c request.CTX, email string, pa
 	return resultVar0, resultVar1
 }
 
-func (a *OpenTracingAppLayer) SyncLdap(c request.CTX, includeRemovedMembers bool) {
+func (a *OpenTracingAppLayer) SyncLdap(rctx request.CTX, includeRemovedMembers bool) {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SyncLdap")
 
@@ -17476,7 +17476,7 @@ func (a *OpenTracingAppLayer) SyncLdap(c request.CTX, includeRemovedMembers bool
 	}()
 
 	defer span.Finish()
-	a.app.SyncLdap(c, includeRemovedMembers)
+	a.app.SyncLdap(rctx, includeRemovedMembers)
 }
 
 func (a *OpenTracingAppLayer) SyncPlugins() *model.AppError {