Merge branch 'patch-parallel_tests' into 'develop'

Patch parallel tests

See merge request !109

public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/core/config/ConfigTest.scala

@@ -48,7 +48,7 @@ class ConfigTest extends TestNGSuite with Matchers with ConfigUtils.ImplicitConv
     Config.getValueFromMap(map, new ConfigValueIndex("5", List("1", "2", "3", "dummy", "dummy", "4", "5"), "k1")).get.asString shouldBe "v1"
   }
 
-  @DataProvider(name = "testGetValueFromMapProvider", parallel = true)
+  @DataProvider(name = "testGetValueFromMapProvider")
   def testGetValueFromMapProvider() = {
     Array(
       Array("m1", Nil, "k1", true, "v2"),

public/carp/src/test/scala/nl/lumc/sasc/biopet/pipelines/carp/CarpTest.scala

@@ -28,7 +28,7 @@ class CarpTest extends TestNGSuite with Matchers {
     }
   }
 
-  @DataProvider(name = "carpOptions", parallel = true)
+  @DataProvider(name = "carpOptions")
   def carpOptions = {
     val bool = Array(true, false)
 

public/flexiprep/src/test/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/FlexiprepTest.scala

@@ -29,7 +29,7 @@ class FlexiprepTest extends TestNGSuite with Matchers {
     }
   }
 
-  @DataProvider(name = "flexiprepOptions", parallel = true)
+  @DataProvider(name = "flexiprepOptions")
   def flexiprepOptions = {
     val paired = Array(true, false)
     val skipTrims = Array(true, false)

public/mapping/src/test/scala/nl/lumc/sasc/biopet/pipelines/mapping/MappingTest.scala

@@ -30,7 +30,7 @@ class MappingTest extends TestNGSuite with Matchers {
     }
   }
 
-  @DataProvider(name = "mappingOptions", parallel = true)
+  @DataProvider(name = "mappingOptions")
   def mappingOptions = {
     val aligners = Array("bwa", "bwa-aln", "star", "star-2pass", "bowtie", "stampy")
     val paired = Array(true, false)