Merge 26.3 to 26.6

Author: labkey-teamcity

src/org/labkey/test/pages/reports/ScriptReportPage.java

@@ -229,7 +229,7 @@ private void _clickReportTab()
         scrollToTop(); // Clicking report tab can scroll such that the cursor hovers over and opens the project menu
         waitAndClick(Ext4Helper.Locators.tab("Report"));
         // Report view should appear quickly
-        shortWait().until(ExpectedConditions.visibilityOfElementLocated(Locator.tagWithClass("div", "reportView")));
+        longWait().until(ExpectedConditions.visibilityOfElementLocated(Locator.tagWithClass("div", "reportView")));
         // Actual report might take a while to load
         _ext4Helper.waitForMaskToDisappear(BaseWebDriverTest.WAIT_FOR_PAGE);
     }

src/org/labkey/test/tests/AbstractKnitrReportTest.java

@@ -234,7 +234,7 @@ protected void moduleReportDependencies()
         clickProject(getProjectName());
         _ext4Helper.waitForMaskToDisappear();
         waitAndClickAndWait(Locator.linkWithText("kable"));
-        _ext4Helper.waitForMaskToDisappear(3 * BaseWebDriverTest.WAIT_FOR_JAVASCRIPT);
+        _ext4Helper.waitForMaskToDisappear(60_000);
         waitForElement(Locator.id("mtcars_table"));
     }
 

src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java

@@ -118,7 +118,7 @@ public void testUpload200kRows() throws Exception
 
         // wait for import complete
         var assayJobsPage1 = new AssayUploadJobsPage(getDriver());
-        var pipelineDetailsPage1 = assayJobsPage1.clickJobStatus("200k", 3 * WebDriverWrapper.WAIT_FOR_PAGE);
+        var pipelineDetailsPage1 = assayJobsPage1.clickJobStatus("200k", 6 * WebDriverWrapper.WAIT_FOR_PAGE);
         pipelineDetailsPage1.waitForComplete(12 * WebDriverWrapper.WAIT_FOR_PAGE);
 
         // export assay1 data to excel