Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testcontainers-scala version #3815

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Update testcontainers-scala version #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions clients/spark/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ def generateCoreProject(buildType: BuildType) =
"org.xerial.snappy" % "snappy-java" % "1.1.8.4",
"org.scalactic" %% "scalactic" % "3.2.9",
"org.scalatest" %% "scalatest" % "3.2.9" % "test",
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.39.11" % "test",
"com.dimafeng" %% "testcontainers-scala-munit" % "0.39.11" % "test",
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.10" % "test",
"com.lihaoyi" %% "upickle" % "1.4.0" % "test",
"com.lihaoyi" %% "os-lib" % "0.7.8" % "test"
),
Expand Down
17 changes: 9 additions & 8 deletions clients/spark/core/src/test/scala/io/treeverse/jpebble/BlockParserSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ package io.treeverse.jpebble

import org.scalatest._
import matchers.should._
import org.scalatest.matchers.must.Matchers.contain
import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper
import funspec._

import com.dimafeng.testcontainers.{ForAllTestContainer, GenericContainer}
import com.dimafeng.testcontainers.GenericContainer.FileSystemBind
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy
import org.testcontainers.containers.BindMode

import java.io.File
import java.nio.charset.StandardCharsets
import org.apache.commons.io.IOUtils

import scala.io.Source
import org.testcontainers.containers.BindMode
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy
import org.scalatest.matchers.must.Matchers.contain
import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper

class BlockReadableSpec extends AnyFunSpec with Matchers {

Expand Down Expand Up @@ -301,13 +303,12 @@ class CountedIteratorSpec extends AnyFunSpec with Matchers {
}

class GolangContainerSpec extends AnyFunSpec with ForAllTestContainer {

override val container: GenericContainer = GenericContainer(
"golang:1.16.2-alpine",
classpathResourceMapping = Seq(
("parser-test/sst_files_generator.go", "/local/sst_files_generator.go", BindMode.READ_WRITE),
("parser-test/go.mod", "/local/go.mod", BindMode.READ_WRITE),
("parser-test/go.sum", "/local/go.sum", BindMode.READ_WRITE)
FileSystemBind("parser-test/sst_files_generator.go", "/local/sst_files_generator.go", BindMode.READ_WRITE),
FileSystemBind("parser-test/go.mod", "/local/go.mod", BindMode.READ_WRITE),
FileSystemBind("parser-test/go.sum", "/local/go.sum", BindMode.READ_WRITE)
),
command = Seq("/bin/sh",
"-c",
Expand Down