Skip to content

Commit

Permalink
Revert "Revert "more parallel tests""
Browse files Browse the repository at this point in the history
This reverts commit b4f8c75.
  • Loading branch information
pm47 committed Sep 2, 2019
1 parent b4f8c75 commit 77b131e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

package fr.acinq.eclair

import org.scalatest.FunSuite
import org.scalatest.{FunSuite, ParallelTestExecution}

/**
* Created by t-bast on 21/08/2019.
*/

class CltvExpirySpec extends FunSuite {
class CltvExpirySpec extends FunSuite with ParallelTestExecution {

test("cltv expiry delta") {
val d = CltvExpiryDelta(561)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
package fr.acinq.eclair

import fr.acinq.bitcoin.{Btc, MilliBtc, Satoshi}
import org.scalatest.FunSuite
import org.scalatest.{FunSuite, ParallelTestExecution}
import scodec.bits._


class CoinUtilsSpec extends FunSuite {
class CoinUtilsSpec extends FunSuite with ParallelTestExecution {

test("use unsigned comparison when comparing millisatoshis to uint64") {
assert(MilliSatoshi(123).compareUnsigned(UInt64(123)) == 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ import fr.acinq.eclair.payment.PaymentLifecycle.{ReceivePayment, SendPayment, Se
import fr.acinq.eclair.payment.PaymentRequest.ExtraHop
import fr.acinq.eclair.router.RouteCalculationSpec.makeUpdate
import org.mockito.scalatest.IdiomaticMockito
import org.scalatest.{Outcome, fixture}
import org.scalatest.{Outcome, ParallelTestExecution, fixture}
import scodec.bits._

import scala.concurrent.Await
import scala.concurrent.duration._
import scala.util.Success

class EclairImplSpec extends TestKit(ActorSystem("mySystem")) with fixture.FunSuiteLike with IdiomaticMockito {
class EclairImplSpec extends TestKit(ActorSystem("mySystem")) with fixture.FunSuiteLike with IdiomaticMockito with ParallelTestExecution {

implicit val timeout = Timeout(30 seconds)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import fr.acinq.eclair.router.Graph.{RichWeight, WeightRatios}
import fr.acinq.eclair.transactions.Transactions
import fr.acinq.eclair.wire._
import fr.acinq.eclair.{CltvExpiryDelta, LongToBtcAmount, MilliSatoshi, ShortChannelId, randomKey}
import org.scalatest.FunSuite
import org.scalatest.{FunSuite, ParallelTestExecution}
import scodec.bits._

import scala.collection.immutable.SortedMap
Expand All @@ -35,7 +35,7 @@ import scala.util.{Failure, Success}
* Created by PM on 31/05/2016.
*/

class RouteCalculationSpec extends FunSuite {
class RouteCalculationSpec extends FunSuite with ParallelTestExecution {

import RouteCalculationSpec._

Expand Down

0 comments on commit 77b131e

Please sign in to comment.