Commit ecb8a8f3 authored by Peter van 't Hof's avatar Peter van 't Hof Committed by GitHub

Merge branch 'develop' into Fix-BIOPET-479

parents cbbd03b7 4fb8a7b6
......@@ -56,12 +56,7 @@ class GearsSingle(val parent: Configurable) extends QScript with SummaryQScript
if (sampleId == null || sampleId == None) Logging.addError("Missing sample ID on GearsSingle module")
if (outputName == null) {
if (fastqR1.nonEmpty) outputName =
else outputName =".bam")).getOrElse("noName")
outputName = sampleId.getOrElse("noName") +"-" + _).getOrElse("")
if (fastqR1.nonEmpty) {
......@@ -108,7 +108,7 @@ abstract class TestGearsSingle extends TestNGSuite with Matchers {
gears.outputName shouldBe "test"
} else {
// in the following cases the filename should have been determined by the filename
gears.outputName shouldBe (if (inputMode == Some("bam")) "bamfile" else "R1")
gears.outputName shouldBe "sampleName-libName"
val pipesJobs = gears.functions.filter(_.isInstanceOf[BiopetCommandLineFunction])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment