Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFR] Limit analysis verifyStatus timeout to 10 mins #1289

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −8
Open

[RFR] Limit analysis verifyStatus timeout to 10 mins #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a52d66
Limit analysis verifyStatus timeout to 10 mins
mguetta1 Dec 10, 2024
9673717
Changes after review
mguetta1 Dec 11, 2024
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
9 changes: 5 additions & 4 deletions cypress/e2e/models/migration/applicationinventory/analysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
button,
clearAllFilters,
Languages,
MIN,
ReportTypeSelectors,
RepositoryType,
save,
Expand Down Expand Up @@ -363,13 +364,13 @@ export class Analysis extends Application {
doesExistSelector(analyzeAppButton, rbacRules["Analyze"]);
}

verifyAnalysisStatus(status: string) {
verifyAnalysisStatus(status: string, timeout?: number) {
cy.log(`Verifying analysis status, expecting ${status}`);
cy.get(tdTag, { log: false })
.contains(this.name, { log: false })
.closest(trTag, { log: false })
.within(() => {
Analysis.verifyStatus(cy.get(analysisColumn, { log: false }), status);
Analysis.verifyStatus(cy.get(analysisColumn, { log: false }), status, timeout);
});
this.selectApplication();
}
Expand All @@ -390,9 +391,9 @@ export class Analysis extends Application {
});
}

public static verifyStatus(element: Cypress.Chainable, status: string) {
public static verifyStatus(element: Cypress.Chainable, status: string, timeout = 10 * MIN) {
element
.find("div > div:nth-child(2)", { timeout: 3600000, log: false }) // 1h
.find("div > div:nth-child(2)", { timeout: timeout, log: false })
.should("not.have.text", AnalysisStatuses.notStarted)
.and("not.have.text", AnalysisStatuses.scheduled)
.and("not.have.text", AnalysisStatuses.inProgress)
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/tests/migration/applicationinventory/analysis/load_analysis.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
deleteApplicationTableRows,
} from "../../../../../utils/utils";
import { Analysis } from "../../../../models/migration/applicationinventory/analysis";
import { AnalysisStatuses, SEC } from "../../../../types/constants";
import { AnalysisStatuses, MIN, SEC } from "../../../../types/constants";
import { Application } from "../../../../models/migration/applicationinventory/application";
import { CustomMigrationTarget } from "../../../../models/administration/custom-migration-targets/custom-migration-target";
import * as data from "../../../../../utils/data_utils";
Expand Down Expand Up @@ -93,7 +93,7 @@ describe(["@tier2"], "Source Analysis of big applications", () => {
cy.wait("@getApplication");
cy.wait(2 * SEC);
application.analyze();
application.verifyAnalysisStatus(AnalysisStatuses.completed);
application.verifyAnalysisStatus(AnalysisStatuses.completed, 60 * MIN);
});

it("Source Analysis on OpenMRS app", function () {
Expand All @@ -108,7 +108,7 @@ describe(["@tier2"], "Source Analysis of big applications", () => {
cy.wait("@getApplication");
cy.wait(2 * SEC);
application.analyze();
application.verifyAnalysisStatus(AnalysisStatuses.completed);
application.verifyAnalysisStatus(AnalysisStatuses.completed, 30 * MIN);
});

after("Test data clean up", function () {
Expand Down
3 changes: 2 additions & 1 deletion cypress/e2e/types/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ export const max120CharsMsg = "This field must contain fewer than 120 characters
export const max250CharsMsg = "This field must contain fewer than 250 characters.";
export const minCharsMsg = "This field must contain at least 3 characters.";

export const SEC = 1000;
export const SEC = 1000; // milliseconds
export const MIN = 60000; // milliseconds
export const administration = "Administration";
export const migration = "Migration";
export const general = "General";
Expand Down
Loading