Skip to content

Merge discvr-23.3 to develop#175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbimber merged 3 commits into from
Jun 20, 2023
Merged

Merge discvr-23.3 to develop #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3eccad
Improve MCC test
bbimber Jun 19, 2023
b2a5ccd
Correct SnpSift args
bbimber Jun 19, 2023
4a1bcc0
Merge discvr-23.3 to develop
bbimber Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions mGAP/src/org/labkey/mgap/pipeline/SnpSiftWrapper.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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());

Expand Down
1 change: 1 addition & 0 deletions mcc/test/src/org/labkey/test/tests/mcc/MccTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand Down