Skip to content

Commit c7f20b3

Browse files
committed
Fix test
1 parent abf97f5 commit c7f20b3

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI
22
on:
3-
[ pull_request, push ]
3+
push:
44
jobs:
55
test:
66
runs-on: ubuntu-latest

config/src/test/scala/com/whisk/docker/config/test/DockerConfigSpec.scala

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,26 @@ class DockerConfigSpec extends FlatSpec with Matchers with DockerKitConfig {
1818
.withPorts(9042 -> None)
1919
.withReadyChecker(DockerReadyChecker.LogLineContains("Starting listening for CQL clients on"))
2020
.withVolumes(volumes)
21+
.withHostConfig(HostConfig(None, None, None))
2122

2223
configureDockerContainer("docker.cassandra") shouldBe cassandraExpected
2324

2425
val postgresExpected = DockerContainer("postgres:9.4.4")
2526
.withPorts((5432, None))
2627
.withEnv(s"POSTGRES_USER=nph", s"POSTGRES_PASSWORD=suitup")
2728
.withReadyChecker(
28-
DockerReadyChecker.LogLineContains("database system is ready to accept connections"))
29+
DockerReadyChecker.LogLineContains("database system is ready to accept connections")
30+
)
31+
.withHostConfig(HostConfig(None, None, None))
32+
2933

3034
configureDockerContainer("docker.postgres") shouldBe postgresExpected
3135

3236
val mongodbExpected = DockerContainer("mongo:3.0.6")
3337
.withPorts(27017 -> None)
3438
.withReadyChecker(DockerReadyChecker.LogLineContains("waiting for connections on port"))
3539
.withCommand("mongod", "--nojournal", "--smallfiles", "--syncdelay", "0")
40+
.withHostConfig(HostConfig(None, None, None))
3641

3742
configureDockerContainer("docker.mongodb") shouldBe mongodbExpected
3843

@@ -44,7 +49,8 @@ class DockerConfigSpec extends FlatSpec with Matchers with DockerKitConfig {
4449
DockerReadyChecker
4550
.HttpResponseCode(9200, "/")
4651
.within(100.millis)
47-
.looped(20, 1250.millis))
52+
.looped(20, 1250.millis)
53+
)
4854

4955
configureDockerContainer("docker.elasticsearch") shouldBe elasticExpected
5056
}

0 commit comments

Comments
 (0)