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.

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

fix: Deadlock in PostgreSQL. #4445

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix: tests.
armory-abedonik committed Apr 17, 2023
commit dc3ea006c4a1c3f6f797f524151bebc0d8a322bd
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fiatVersion=1.39.0
korkVersion=7.171.2
korkVersion=7.172.0
kotlinVersion=1.4.32
org.gradle.parallel=true
spinnakerGradleVersion=8.26.0
Original file line number Diff line number Diff line change
@@ -47,23 +47,29 @@ import com.netflix.spinnaker.q.Queue
import com.netflix.spinnaker.q.metrics.EventPublisher
import com.netflix.spinnaker.q.metrics.MonitorableQueue
import com.netflix.spinnaker.q.sql.SqlQueue
import com.zaxxer.hikari.HikariConfig
import de.huxhorn.sulky.ulid.ULID
import java.time.Clock
import java.time.Duration
import java.util.Optional
import org.jooq.DSLContext
import org.jooq.SQLDialect
import org.junit.runner.RunWith
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.test.context.junit4.SpringRunner
import java.time.Clock
import java.time.Duration
import java.util.*

@Configuration
class SqlTestConfig {
@Bean
fun jooq(): DSLContext {
val testDatabase = SqlTestUtil.initTcMysqlDatabase()
val hikariConfig = HikariConfig()
hikariConfig.jdbcUrl = SqlTestUtil.tcJdbcUrl
hikariConfig.maximumPoolSize = 10

val testDatabase = SqlTestUtil.initDatabase(hikariConfig, SQLDialect.MYSQL, "test")
return testDatabase.context
}