Merge pull request #175 from LabKey/fb_merge_23.3_to_develop

Merge discvr-23.3 to develop

Author: bbimber

mGAP/src/org/labkey/mgap/pipeline/SnpSiftWrapper.java

@@ -32,12 +32,11 @@ public void runSnpSift(File dbnsfpFile, File input, File output) throws Pipeline
         params.addAll(SequencePipelineService.get().getJavaOpts());
         params.add("-jar");
         params.add(getSnpSiftJar().getPath());
-        params.add("dbnsfp");
+        params.add("DbNsfp");
         params.add("-db");
         params.add(dbnsfpFile.getPath());
 
-        params.add("-noStats");
-        params.add("-nodownload");
+        params.add("-noDownload");
 
         params.add(input.getPath());
 

mcc/test/src/org/labkey/test/tests/mcc/MccTest.java

@@ -107,6 +107,7 @@ private void testAnimalImportAndTransfer() throws Exception
         Ext4FieldRef.getForLabel(this, "Effective Date").setValue(new SimpleDateFormat("MM/dd/yyyy").format(new Date()));
         Ext4ComboRef combo = Ext4ComboRef.getForLabel(this, "Destination Center Name");
         combo.clickTrigger();
+        combo.waitForStoreLoad();
         waitAndClick(Locator.tagContainingText("li", "Other"));
 
         Window<?> dialog = new Window.WindowFinder(getDriver()).withTitle("Enter Value").waitFor();