Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/lib/processSnapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ export async function prepareSnapshot(snapshot: Snapshot, ctx: Context): Promise
processedOptions.testName = ctx.testIdTestNameMap.get(processedOptions.testId);
} else if (ctx.sessionCapabilitiesMap && ctx.sessionCapabilitiesMap.has(sessionId)) {
const sessionCapabilities = ctx.sessionCapabilitiesMap.get(sessionId);
if (sessionCapabilities && sessionCapabilities.name) {
processedOptions.testName = sessionCapabilities.name;
const sessionTestName = sessionCapabilities?.testName || sessionCapabilities?.name;
if (sessionTestName) {
processedOptions.testName = sessionTestName;
}
}
}
Expand Down Expand Up @@ -594,8 +595,9 @@ export default async function processSnapshot(snapshot: Snapshot, ctx: Context):
processedOptions.testName = ctx.testIdTestNameMap.get(processedOptions.testId);
} else if (ctx.sessionCapabilitiesMap && ctx.sessionCapabilitiesMap.has(sessionId)) {
const sessionCapabilities = ctx.sessionCapabilitiesMap.get(sessionId);
if (sessionCapabilities && sessionCapabilities.name) {
processedOptions.testName = sessionCapabilities.name;
const sessionTestName = sessionCapabilities?.testName || sessionCapabilities?.name;
if (sessionTestName) {
processedOptions.testName = sessionTestName;
}
}
}
Expand Down
18 changes: 10 additions & 8 deletions src/lib/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ export default async (ctx: Context): Promise<FastifyInstance<Server, IncomingMes
// Use cached capabilities if available
const cachedCapabilities = ctx.sessionCapabilitiesMap.get(sessionId);
capsBuildId = cachedCapabilities?.buildId || ''
if (cachedCapabilities?.name) {
snapshot.options.testName = cachedCapabilities.name;
const cachedTestName = cachedCapabilities?.testName || cachedCapabilities?.name;
if (cachedTestName) {
snapshot.options.testName = cachedTestName;
if (cachedCapabilities?.id) {
ctx.testIdTestNameMap?.set(cachedCapabilities.id, cachedCapabilities.name);
ctx.testIdTestNameMap?.set(cachedCapabilities.id, cachedTestName);
}
}
} else {
Expand All @@ -119,11 +120,12 @@ export default async (ctx: Context): Promise<FastifyInstance<Server, IncomingMes
let fetchedCapabilitiesResp = await ctx.client.getSmartUICapabilities(sessionId, ctx.config, ctx.git, ctx.log, ctx.isStartExec, ctx.options.baselineBuild, ctx.env);
capsBuildId = fetchedCapabilitiesResp?.buildId || ''
ctx.log.debug(`fetch caps for sessionId: ${sessionId} are ${JSON.stringify(fetchedCapabilitiesResp)}`)
if (fetchedCapabilitiesResp?.name) {
snapshot.options.testName = fetchedCapabilitiesResp.name;
const fetchedTestName = fetchedCapabilitiesResp?.testName || fetchedCapabilitiesResp?.name;
if (fetchedTestName) {
snapshot.options.testName = fetchedTestName;
const testIdForCache = fetchedCapabilitiesResp?.id || fetchedCapabilitiesResp?.testId;
if (testIdForCache) {
ctx.testIdTestNameMap?.set(testIdForCache, fetchedCapabilitiesResp.name);
ctx.testIdTestNameMap?.set(testIdForCache, fetchedTestName);
}
}
if (capsBuildId) {
Expand All @@ -134,8 +136,8 @@ export default async (ctx: Context): Promise<FastifyInstance<Server, IncomingMes
// LTMS fallback: only testId returned, no buildId
ctx.sessionTestIdMap?.set(sessionId, fetchedCapabilitiesResp.testId);
snapshot.options.testId = fetchedCapabilitiesResp.testId;
if (fetchedCapabilitiesResp?.name) {
ctx.testIdTestNameMap?.set(fetchedCapabilitiesResp.testId, fetchedCapabilitiesResp.name);
if (fetchedTestName) {
ctx.testIdTestNameMap?.set(fetchedCapabilitiesResp.testId, fetchedTestName);
}
ctx.log.debug(`Cached LTMS fallback testId for sessionId ${sessionId}: ${fetchedCapabilitiesResp.testId}`);
}
Expand Down