Skip to content

Commit 3bc1602

Browse files
committed
Improve errors
1 parent 2a7c82c commit 3bc1602

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

SequenceAnalysis/test/src/org/labkey/test/tests/external/labModules/SequenceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private boolean isExternalPipelineEnabled()
113113
}
114114
log("sequencePipelineEnabled: " + sequencePipelineEnabled);
115115

116-
if (TestProperties.isTestRunningOnTeamCity() && !sequencePipelineEnabled)
116+
if (!sequencePipelineEnabled && TestProperties.isTestRunningOnTeamCity() && WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL)
117117
{
118118
throw new IllegalStateException("When running on team city, -DsequencePipelineEnabled should be true");
119119
}

jbrowse/src/org/labkey/jbrowse/JBrowseManager.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,11 @@ public File getJbrowseCli() throws PipelineJobException
175175
{
176176
Module module = ModuleLoader.getInstance().getModule(JBrowseModule.NAME);
177177
DirectoryResource resource = (DirectoryResource) module.getModuleResolver().lookup(Path.parse("external/jb-cli"));
178+
if (resource == null)
179+
{
180+
throw new PipelineJobException("Unable to find expected module resource: external/jb-cli");
181+
}
182+
178183
File toolDir = resource.getDir();
179184
if (!toolDir.exists())
180185
{

0 commit comments

Comments
 (0)