Skip to content

Commit bf98ae0

Browse files
committed
Rename class and freeze image versions
1 parent 93bcf45 commit bf98ae0

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

sql/core/src/test/scala/org/apache/spark/sql/jdbc/DockerHacks.scala renamed to sql/core/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ abstract class DatabaseOnDocker {
5555
def getJdbcUrl(ip: String, port: Int): String
5656
}
5757

58-
abstract class DatabaseIntegrationSuite
58+
abstract class DockerJDBCIntegrationSuite
5959
extends SparkFunSuite
6060
with BeforeAndAfterAll
6161
with Eventually

sql/core/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import java.math.BigDecimal
2121
import java.sql.{Connection, Date, Timestamp}
2222
import java.util.Properties
2323

24-
class MySQLIntegrationSuite extends DatabaseIntegrationSuite {
25-
val db = new DatabaseOnDocker {
26-
override val imageName = "mysql:latest"
24+
class MySQLIntegrationSuite extends DockerJDBCIntegrationSuite {
25+
override val db = new DatabaseOnDocker {
26+
override val imageName = "mysql:5.7.9"
2727
override val env = Map(
2828
"MYSQL_ROOT_PASSWORD" -> "rootpass"
2929
)

sql/core/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ package org.apache.spark.sql.jdbc
2020
import java.sql.Connection
2121
import java.util.Properties
2222

23-
class PostgresIntegrationSuite extends DatabaseIntegrationSuite {
24-
val db = new DatabaseOnDocker {
25-
override val imageName = "postgres:latest"
23+
class PostgresIntegrationSuite extends DockerJDBCIntegrationSuite {
24+
override val db = new DatabaseOnDocker {
25+
override val imageName = "postgres:9.4.5"
2626
override val env = Map(
2727
"POSTGRES_PASSWORD" -> "rootpass"
2828
)

0 commit comments

Comments
 (0)