Skip to content

Commit

Permalink
Changes after review
Browse files Browse the repository at this point in the history
Signed-off-by: Maayan Hadasi <[email protected]>
  • Loading branch information
mguetta1 committed Jan 26, 2025
1 parent b18ca53 commit 8d6557d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
18 changes: 10 additions & 8 deletions cypress/e2e/tests/migration/task-manager/miscellaneous.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import * as commonView from "../../../views/common.view";
import { TaskManagerColumns } from "../../../views/taskmanager.view";

describe(["@tier2"], "Actions in Task Manager Page", function () {
const applicationsList: Array<Analysis> = [];
const applicationsList: Analysis[] = [];
let bookServerApp: Analysis;

before("Login", function () {
Expand All @@ -52,10 +52,11 @@ describe(["@tier2"], "Actions in Task Manager Page", function () {
});

it("Limit pods to the number of tackle pods + 1", function () {
let namespace = getNamespace();
let command = `oc get pod --no-headers -n ${namespace} | grep -v task | grep -v Completed | wc -l`;
// Polarion TC MTA-553
const namespace = getNamespace();
const command = `oc get pod --no-headers -n ${namespace} | grep -v task | grep -v Completed | wc -l`;
getCommandOutput(command).then((output) => {
let podsNumber = Number(output.stdout) + 1;
const podsNumber = Number(output.stdout) + 1;
limitPodsByQuota(podsNumber);
});
});
Expand All @@ -71,12 +72,13 @@ describe(["@tier2"], "Actions in Task Manager Page", function () {
bookServerApp.create();
applicationsList.push(bookServerApp);
}
TaskManager.setPreemption(applicationsList[1].name, TaskKind.languageDiscovery, true);
const app = applicationsList[1];
TaskManager.setPreemption(app.name, TaskKind.languageDiscovery, true);
checkSuccessAlert(commonView.infoAlertMessage, "Update request submitted.");
TaskManager.verifyPreemption(applicationsList[1].name, TaskKind.languageDiscovery, true);
TaskManager.setPreemption(applicationsList[1].name, TaskKind.languageDiscovery, false);
TaskManager.verifyPreemption(app.name, TaskKind.languageDiscovery, true);
TaskManager.setPreemption(app.name, TaskKind.languageDiscovery, false);
checkSuccessAlert(commonView.infoAlertMessage, "Update request submitted.", true);
TaskManager.verifyPreemption(applicationsList[1].name, TaskKind.languageDiscovery, false);
TaskManager.verifyPreemption(app.name, TaskKind.languageDiscovery, false);
});

it("Cancel Task", function () {
Expand Down
11 changes: 5 additions & 6 deletions cypress/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2020,20 +2020,19 @@ export function downloadTaskDetails(format = downloadFormatDetails.yaml) {
}

export function limitPodsByQuota(podsNumber: number) {
let namespace = getNamespace();
const namespace = getNamespace();
cy.fixture("custom-resource").then((cr) => {
let manifast = cr["resourceQuota"];
let command = `PODS_NUMBER=${podsNumber} envsubst < ${manifast} | oc apply -f - -n ${namespace}`;
// let command = `export PODS_COUNT=6; oc apply -f ${manifast} -n${namespace}`;
const manifast = cr["resourceQuota"];
const command = `PODS_NUMBER=${podsNumber} envsubst < ${manifast} | oc apply -f - -n ${namespace}`;
getCommandOutput(command).then((output) => {
expect(output.stdout).to.equal("resourcequota/task-pods created");
});
});
}

export function deleteCustomResource(resourceType: string, resourceName: string) {
let namespace = getNamespace();
let command = `oc delete ${resourceType} ${resourceName} -n${namespace}`;
const namespace = getNamespace();
const command = `oc delete ${resourceType} ${resourceName} -n${namespace}`;
getCommandOutput(command).then((output) => {
expect(output.code).to.equal(0);
});
Expand Down

0 comments on commit 8d6557d

Please sign in to comment.