From acc5f37b8d4980520c8cff9d83f87cd64f4f6395 Mon Sep 17 00:00:00 2001 From: Chris Joosse Date: Thu, 21 Nov 2024 09:43:48 -0800 Subject: [PATCH 1/2] give large excel assay test more time on windows/sql (#2149) --- .../labkey/test/tests/assay/UploadLargeExcelAssayTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java b/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java index 9fa281c934..69793cf139 100644 --- a/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java +++ b/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java @@ -112,7 +112,7 @@ public void testUpload200kRows() throws Exception clickButton("Save and Finish"); // wait for import complete - waitForPipelineJobsToComplete(1, "200k", false); + waitForPipelineJobsToComplete(1, "200k", false, 12 * 60000); // export assay1 data to excel log("exporting samples fields to excel"); @@ -133,7 +133,7 @@ public void testUpload200kRows() throws Exception setFormElement(Locator.input("__primaryFile__"), largeExportExcelFile); clickButton("Save and Finish"); - waitForPipelineJobsToComplete(2, "200k take 2", false); + waitForPipelineJobsToComplete(2, "200k take 2", false, 12 * 60000); var qPage = SourceQueryPage.beginAt(this, getProjectName(), "assay.General.large_assay_2", "Data"); var dataregion = qPage.viewData(Duration.ofSeconds(60)); From f6152bc6afd0762a7e2484ac3a869a179673fb24 Mon Sep 17 00:00:00 2001 From: Dan Duffek Date: Sun, 24 Nov 2024 21:44:00 -0800 Subject: [PATCH 2/2] SM Test Fixes (#2146) --- src/org/labkey/test/tests/component/EditableGridTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/component/EditableGridTest.java b/src/org/labkey/test/tests/component/EditableGridTest.java index 46947f8e08..cddbef3a13 100644 --- a/src/org/labkey/test/tests/component/EditableGridTest.java +++ b/src/org/labkey/test/tests/component/EditableGridTest.java @@ -9,6 +9,7 @@ import org.labkey.remoteapi.query.InsertRowsCommand; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; +import org.labkey.test.WebDriverWrapper; import org.labkey.test.categories.Daily; import org.labkey.test.components.ui.grids.EditableGrid; import org.labkey.test.pages.test.CoreComponentsTestPage; @@ -1444,7 +1445,12 @@ public void testPasteCellValidation() List expectedWarnings = expectedCellWarnings.get(row); verifyCellWarning(testGrid, expectedWarnings, row); } - mouseOver(testGrid.getCell(0, STR_FIELD_NAME)); // dismiss warning popup + + // Dismiss warning popup by moving off the grid. + mouseOver(Locator.tagWithClass("a", "brand-logo").findWhenNeeded(getDriver())); + + WebDriverWrapper.waitFor(()->!Locator.tagWithClass("div", "popover").findWhenNeeded(getDriver()).isDisplayed(), + "Bad value popup did not go away.", 500); log("Correct missing required fields should remove corresponding cell warnings"); testGrid.setCellValue(1, REQ_STR_FIELD_NAME + " *", " ");