mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-22 22:36:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Tests] Kill all bitcoind instances after running

Browse source
This commit is contained in:
rorp 2019-06-13 19:22:56 -07:00
parent 6f003e09fb
commit 3a1c9284dc
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/P2PRpcTest.scala
View file

@ -170,7 +170,7 @@ class P2PRpcTest extends BitcoindRpcTest {
it should "be able to get the connection count" in { it should "be able to get the connection count" in {
for { for {
(freshClient, otherFreshClient) <- BitcoindRpcTestUtil (freshClient, otherFreshClient) <- BitcoindRpcTestUtil
.createUnconnectedNodePair() .createUnconnectedNodePair(clientAccum = clientAccum)
connectionPre <- freshClient.getConnectionCount connectionPre <- freshClient.getConnectionCount
_ <- freshClient.addNode(otherFreshClient.getDaemon.uri, _ <- freshClient.addNode(otherFreshClient.getDaemon.uri,
AddNodeArgument.Add) AddNodeArgument.Add)

10
node-test/src/test/scala/org/bitcoins/node/networking/ClientTest.scala
View file

@ -13,9 +13,10 @@ import org.bitcoins.testkit.node.NodeTestUtil
import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
import org.scalatest._ import org.scalatest._
import scala.concurrent.Future import scala.concurrent.{Await, Future}
import scala.concurrent.duration.DurationInt import scala.concurrent.duration.{Duration, DurationInt}
import org.bitcoins.testkit.BitcoinSAppConfig import org.bitcoins.testkit.BitcoinSAppConfig
import org.bitcoins.testkit.chain.ChainUnitTest
/** /**
* Created by chris on 6/7/16. * Created by chris on 6/7/16.
@ -100,8 +101,9 @@ class ClientTest
} }
override def afterAll: Unit = { override def afterAll: Unit = {
bitcoindRpcF.flatMap(_.stop()) implicit val ec = system.dispatcher
bitcoindRpc2F.flatMap(_.stop()) Await.ready(bitcoindRpcF.flatMap(ChainUnitTest.destroyBitcoind(_)(system)), 10.seconds)
Await.ready(bitcoindRpc2F.flatMap(ChainUnitTest.destroyBitcoind(_)(system)), 10.seconds)
TestKit.shutdownActorSystem(system) TestKit.shutdownActorSystem(system)
} }