Skip to content

Commit d17eddb

Browse files
committed
Allow BasicTest to run even if sequencePipelineEnabled=false
1 parent 6896cc0 commit d17eddb

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceIntegrationTests.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,6 @@ public void setUp() throws Exception
252252
{
253253
_context = TestContext.get();
254254
_sampleData = getSampleDataDir();
255-
if (_sampleData == null || !_sampleData.exists())
256-
{
257-
throw new Exception("sampledata folder does not exist: " + _sampleData.getPath());
258-
}
259255

260256
_project = ContainerManager.getForPath(getProjectName());
261257
_pipelineRoot = PipelineService.get().getPipelineRootSetting(_project).getRootPath();
@@ -277,7 +273,7 @@ public void setUp() throws Exception
277273
}
278274
}
279275

280-
private File getSampleDataDir()
276+
private File getSampleDataDir() throws Exception
281277
{
282278
Module module = ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class);
283279
DirectoryResource resource = (DirectoryResource) module.getModuleResolver().lookup(Path.parse("sampledata"));
@@ -296,6 +292,11 @@ private File getSampleDataDir()
296292
_log.error("unable to find sampledata directory");
297293
}
298294

295+
if (file == null || !file.exists())
296+
{
297+
throw new Exception("sampledata folder does not exist: " + (file == null ? "null" : file.getPath()));
298+
}
299+
299300
return file;
300301
}
301302

@@ -1446,10 +1447,10 @@ protected Collection<File> addDefaultAlignmentOutputs(File basedir, String jobNa
14461447
@Override
14471448
public void setUp() throws Exception
14481449
{
1450+
super.setUp();
1451+
14491452
if (isExternalPipelineEnabled())
14501453
{
1451-
super.setUp();
1452-
14531454
if (!_hasPerformedSetup)
14541455
{
14551456
copyInputFiles();

0 commit comments

Comments
 (0)