Query hasCedarResults instead of failedTestCount for determining if a…

… task has test results
evergreen-ci · Jan 24, 2024 · aa7a343 · aa7a343
1 parent 014d0cb
commit aa7a343
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 19 deletions.
diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
@@ -2515,6 +2515,7 @@ export type Task = {
   generateTask?: Maybe<Scalars["Boolean"]["output"]>;
   generatedBy?: Maybe<Scalars["String"]["output"]>;
   generatedByName?: Maybe<Scalars["String"]["output"]>;
+  hasCedarResults: Scalars["Boolean"]["output"];
   hostId?: Maybe<Scalars["String"]["output"]>;
   id: Scalars["String"]["output"];
   ingestTime?: Maybe<Scalars["Time"]["output"]>;
@@ -6336,7 +6337,7 @@ export type MainlineCommitsQuery = {
             __typename?: "Task";
             displayName: string;
             execution: number;
-            failedTestCount: number;
+            hasCedarResults: boolean;
             id: string;
             status: string;
             timeTaken?: number | null;

diff --git a/src/gql/queries/mainline-commits.graphql b/src/gql/queries/mainline-commits.graphql
@@ -31,7 +31,7 @@ query MainlineCommits(
           tasks {
             displayName
             execution
-            failedTestCount
+            hasCedarResults
             id
             status
             timeTaken

diff --git a/src/pages/commits/ActiveCommits/BuildVariantCard/BuildVariantCard.test.tsx b/src/pages/commits/ActiveCommits/BuildVariantCard/BuildVariantCard.test.tsx
@@ -59,15 +59,18 @@ const tasks = [
     id: "1",
     status: "failed",
     displayName: "One",
+    hasCedarResults: true,
   },
   {
     id: "2",
     status: "success",
     displayName: "Two",
+    hasCedarResults: true,
   },
   {
     id: "3",
     status: "success",
     displayName: "Three",
+    hasCedarResults: true,
   },
 ];
diff --git a/...ctiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.stories.tsx b/...ctiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.stories.tsx
@@ -26,7 +26,7 @@ export const Default: CustomStoryObj<typeof WaterfallTaskStatusIcon> = {
     taskId: "task-id",
     identifier: "ubuntu1604",
     status: "failed",
-    failedTestCount: 5,
+    hasCedarResults: true,
   },
   argTypes: {
     status: {

diff --git a/...s/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.test.tsx b/...s/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.test.tsx
@@ -27,24 +27,24 @@ const props = {
 jest.mock("../../utils");
 
 const Content = ({
-  failedTestCount = 0,
+  hasCedarResults = false,
   status,
 }: {
   status: string;
-  failedTestCount?: number;
+  hasCedarResults: boolean;
 }) => (
   <MockedProvider mocks={[getTooltipQueryMock]}>
     <WaterfallTaskStatusIcon
       {...props}
       status={status}
-      failedTestCount={failedTestCount}
+      hasCedarResults={hasCedarResults}
     />
   </MockedProvider>
 );
 describe("waterfallTaskStatusIcon", () => {
   it("tooltip should contain task name, duration, list of failing test names and additonal test count", async () => {
     const user = userEvent.setup();
-    render(<Content status="failed" failedTestCount={1} />);
+    render(<Content status="failed" hasCedarResults />);
     await user.hover(screen.queryByDataCy("waterfall-task-status-icon"));
     await waitFor(() => {
       expect(
@@ -67,7 +67,7 @@ describe("waterfallTaskStatusIcon", () => {
   });
 
   it("icon should link to task page", async () => {
-    render(<Content status="failed" />);
+    render(<Content status="failed" hasCedarResults />);
     await waitFor(() => {
       expect(
         screen.getByDataCy("waterfall-task-status-icon"),
@@ -89,7 +89,7 @@ describe("waterfallTaskStatusIcon", () => {
     );
     (removeGlobalHighlightStyle as jest.Mock).mockImplementationOnce(() => {});
 
-    render(<Content status="failed" failedTestCount={1} />);
+    render(<Content status="failed" hasCedarResults />);
     await user.hover(screen.queryByDataCy("waterfall-task-status-icon"));
     await waitFor(() => {
       expect(injectGlobalHighlightStyle).toHaveBeenCalledTimes(1);

diff --git a/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/index.tsx b/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/index.tsx
@@ -28,15 +28,15 @@ interface WaterfallTaskStatusIconProps {
   displayName: string;
   timeTaken?: number;
   identifier: string;
-  failedTestCount?: number;
+  hasCedarResults: boolean;
 }
 
 let timeout;
 export const WaterfallTaskStatusIcon: React.FC<
   WaterfallTaskStatusIconProps
 > = ({
   displayName,
-  failedTestCount,
+  hasCedarResults,
   identifier,
   status,
   taskId,
@@ -60,7 +60,7 @@ export const WaterfallTaskStatusIcon: React.FC<
       injectGlobalHighlightStyle(identifier);
       timeout = setTimeout(() => {
         // Only query failing test names if the task has failed.
-        if (isFailedTaskStatus(status) && failedTestCount > 0) {
+        if (isFailedTaskStatus(status) && hasCedarResults) {
           loadData();
         }
       }, 600);

diff --git a/src/pages/commits/ActiveCommits/BuildVariantCard/index.tsx b/src/pages/commits/ActiveCommits/BuildVariantCard/index.tsx
@@ -18,7 +18,7 @@ type taskList = {
   status: string;
   displayName: string;
   timeTaken?: number;
-  failedTestCount?: number;
+  hasCedarResults: boolean;
 }[];
 interface Props {
   variant: string;
@@ -96,15 +96,15 @@ const RenderTaskIcons: React.FC<RenderTaskIconsProps> = ({ tasks, variant }) =>
       onMouseEnter={() => injectGlobalDimStyle()}
       onMouseLeave={() => removeGlobalDimStyle()}
     >
-      {tasks.map(({ displayName, failedTestCount, id, status, timeTaken }) => (
+      {tasks.map(({ displayName, hasCedarResults, id, status, timeTaken }) => (
         <WaterfallTaskStatusIcon
           key={id}
           taskId={id}
           status={status}
           displayName={displayName}
           timeTaken={timeTaken}
           identifier={`${variant}-${displayName}`}
-          failedTestCount={failedTestCount}
+          hasCedarResults={hasCedarResults}
         />
       ))}
     </IconContainer>

diff --git a/src/pages/commits/ProjectHealth.stories.tsx b/src/pages/commits/ProjectHealth.stories.tsx
@@ -93,7 +93,7 @@ const generateTasks = (count: number) =>
       id: `task_${index}`,
       status: randomStatus(index),
       execution: 0,
-      failedTestCount: 1,
+      hasCedarResults: true,
     }));
 
 /**

diff --git a/src/pages/commits/testData.ts b/src/pages/commits/testData.ts
@@ -12,7 +12,7 @@ const buildVariant1 = {
       id: "auth",
       execution: 0,
       displayName: "auth",
-      failedTestCount: 0,
+      hasCedarResults: false,
     },
   ],
 };
@@ -26,7 +26,7 @@ const buildVariant2 = {
       id: "benchmarks",
       execution: 0,
       displayName: "benchmarks",
-      failedTestCount: 0,
+      hasCedarResults: false,
     },
   ],
 };
@@ -40,7 +40,7 @@ const buildVariant3 = {
       id: "fuzzer",
       execution: 0,
       displayName: "fuzzer",
-      failedTestCount: 1,
+      hasCedarResults: true,
     },
   ],
 };