Merge branch 'develop' into fb_allowFileExtensionAutoTest

Author: labkey-danield

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

@@ -46,7 +46,7 @@ protected void testQWPDemoPage()
         waitForElement(Locator.button("Populate test data"));
         clickButton("Populate test data");
         WebElement populateMessage = Locator.id("populatemessage").waitForElement(shortWait());
-        new WebDriverWait(getDriver(), Duration.ofSeconds(60)).until(ExpectedConditions.visibilityOf(populateMessage)).getText();
+        new WebDriverWait(getDriver(), Duration.ofSeconds(90)).until(ExpectedConditions.visibilityOf(populateMessage)).getText();
         assertEquals("Test data is populated!", populateMessage.getText());
 
         log("Testing " + QWP_SCHEMA_LISTING.getLeft());

src/org/labkey/test/tests/component/EditableGridTest.java

@@ -2,6 +2,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.labkey.remoteapi.CommandException;
@@ -289,6 +290,7 @@ public void testDragFillExtrapolatingIntegersWithPrefix()
     }
 
     @Test
+    @Ignore  // Test disabled until Issue 52226, Issue 51927 are resolved
     public void testDragFillSingleRow()
     {
         final LocalDateTime now = LocalDate.of(2019, 1, 30).atTime(16, 30);
@@ -350,6 +352,7 @@ public void testDragFillSingleRow()
     }
 
     @Test
+    @Ignore  // Test disabled until Issue 52226, Issue 51927 are resolved
     public void testDragFillMultipleRows()
     {
         final LocalDateTime now = LocalDate.of(2019, 1, 30).atTime(14, 30);