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

Commit 7d89018

Browse files
committed
wip
1 parent 394d600 commit 7d89018

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

integrationtest/src/test/groovy/de/gesellix/docker/engine/OkDockerClientIntegrationSpec.groovy

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ class OkDockerClientIntegrationSpec extends Specification {
4646
when:
4747
def response = client.post(request)
4848
then:
49-
response.content.last() in [
50-
[status: "Status: Image is up to date for ${CONSTANTS.imageName}".toString()],
51-
[status: "Status: Downloaded newer image for ${CONSTANTS.imageName}".toString()]
49+
response.content.last().status in [
50+
"Status: Image is up to date for ${CONSTANTS.imageName}".toString(),
51+
"Status: Downloaded newer image for ${CONSTANTS.imageName}".toString(),
5252
]
5353
}
5454

@@ -136,7 +136,9 @@ class OkDockerClientIntegrationSpec extends Specification {
136136
OpenStdin : openStdin,
137137
StdinOnce : true,
138138
Image : CONSTANTS.imageName,
139-
Entrypoint : ["/cat"]
139+
Cmd : LocalDocker.isNativeWindows()
140+
? ["cmd", "/V:ON", "/C", "set /p line= & echo #!line!#"]
141+
: ["/bin/sh", "-c", "read line && echo \"#\$line#\""]
140142
]
141143
String containerId = client.post([path : "/containers/create".toString(),
142144
query : [name: ""],
@@ -179,10 +181,10 @@ class OkDockerClientIntegrationSpec extends Specification {
179181
}
180182
attachConfig.onSourceConsumed = {
181183
if (stdout.toString() == expectedOutput) {
182-
log.info("[attach (interactive)] consumed (complete: ${stdout.toString() == expectedOutput})\n${stdout.toString()}")
184+
log.info("[attach (interactive)] fully consumed (complete: ${stdout.toString() == expectedOutput})\n${stdout.toString()}")
183185
onSourceConsumed.countDown()
184186
} else {
185-
log.info("[attach (interactive)] consumed (complete: ${stdout.toString() == expectedOutput})\n${stdout.toString()}")
187+
log.info("[attach (interactive)] partially consumed (complete: ${stdout.toString() == expectedOutput})\n${stdout.toString()}")
186188
}
187189
}
188190
// new OkDockerClient().post([

0 commit comments

Comments
 (0)