Skip to content
This repository was archived by the owner on Apr 13, 2022. It is now read-only.

Commit 07d30ca

Browse files
authored
Merge pull request #365 from ScorexFoundation/toomany
Fixing "too many open files" error in tests
2 parents 8ddf4af + 97c0a07 commit 07d30ca

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import scala.util.Try
33
name := "scorex-core"
44

55
lazy val commonSettings = Seq(
6-
scalaVersion := "2.12.3",
6+
scalaVersion := "2.12.10",
77
resolvers += Resolver.sonatypeRepo("public"),
88
wartremoverErrors ++= Seq(
99
Wart.Recursion,

src/test/scala/scorex/network/NetworkControllerSpec.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ class TestPeer(settings: ScorexSettings, networkControllerRef: ActorRef, tcpMana
336336
private val messageSpecs = Seq(GetPeersSpec, peersSpec)
337337
private val messagesSerializer = new MessageSerializer(messageSpecs, settings.network.magicBytes)
338338

339+
@SuppressWarnings(Array("org.wartremover.warts.Null"))
339340
private var connectionHandler: ActorRef = _
340341

341342
/**

testkit/src/main/scala/scorex/testkit/utils/FileUtils.scala

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package scorex.testkit.utils
22

3-
import java.io.IOException
4-
import java.nio.file.attribute.BasicFileAttributes
5-
import java.nio.file.{FileVisitResult, Files, Path, SimpleFileVisitor}
3+
import java.nio.file.Path
64

75
import org.scalacheck.Gen
86

@@ -36,20 +34,21 @@ trait FileUtils {
3634
}
3735

3836
/**
39-
* Recursively remove all files and directories in `root`
37+
* Recursively remove all the files and directories in `root`
4038
*/
4139
def remove(root: Path): Unit = {
42-
Files.walkFileTree(root, new SimpleFileVisitor[Path] {
43-
override def visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult = {
44-
Files.delete(file)
45-
FileVisitResult.CONTINUE
46-
}
4740

48-
override def postVisitDirectory(dir: Path, exc: IOException): FileVisitResult = {
49-
Files.delete(dir)
50-
FileVisitResult.CONTINUE
41+
@SuppressWarnings(Array("org.wartremover.warts.Recursion"))
42+
def deleteRecursive(dir: java.io.File): Unit = {
43+
for (file <- dir.listFiles) {
44+
if (file.isDirectory){
45+
deleteRecursive(file)
46+
}
47+
file.delete()
5148
}
52-
})
49+
}
50+
51+
deleteRecursive(root.toFile)
5352
}
5453

5554
private def createTempDirForPrefix(prefix: String): java.io.File = {

0 commit comments

Comments
 (0)