Skip to content

Commit e25490e

Browse files
tomerdweissi
authored andcommitted
improve docker test setup (#129)
motivation: test task to include h2spec changes: * remove older docker-compose files that are not in use on the master branch * move the task definition from the 18.04/5.0 docker compose file to the generic one * create a unit-test task to encapsulate the unit tests and change the test task to include unit tests, integration tests and h2 spec verification
1 parent 2d5ab32 commit e25490e

File tree

5 files changed

+15
-48
lines changed

5 files changed

+15
-48
lines changed

docker/docker-compose.1404.41.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

docker/docker-compose.1604.41.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

docker/docker-compose.1804.42.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

docker/docker-compose.1804.50.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,22 @@ services:
1010
swift_version: "5.0"
1111
h2spec_version: "2.2.1"
1212

13+
unit-tests:
14+
image: swift-nio-http2:18.04-5.0
15+
1316
integration-tests:
1417
image: swift-nio-http2:18.04-5.0
1518
environment:
1619
- MAX_ALLOCS_ALLOWED_create_client_stream_channel=70010
1720
- MAX_ALLOCS_ALLOWED_hpack_decoding=5050
1821
- MAX_ALLOCS_ALLOWED_client_server_request_response=360000
1922

23+
h2spec:
24+
image: swift-nio-http2:18.04-5.0
25+
2026
test:
2127
image: swift-nio-http2:18.04-5.0
22-
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors && ./scripts/integration_tests.sh"
2328
environment:
2429
- MAX_ALLOCS_ALLOWED_create_client_stream_channel=70010
2530
- MAX_ALLOCS_ALLOWED_hpack_decoding=5050
2631
- MAX_ALLOCS_ALLOWED_client_server_request_response=360000
27-
28-
h2spec:
29-
image: swift-nio-http2:18.04-5.0
30-

docker/docker-compose.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,18 @@ services:
2323
<<: *common
2424
command: /bin/bash -cl "./scripts/sanity.sh"
2525

26-
test:
26+
unit-tests:
27+
<<: *common
28+
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors"
29+
30+
integration-tests:
2731
<<: *common
28-
command: /bin/bash -cl "swift test"
32+
command: /bin/bash -cl "./scripts/integration_tests.sh"
2933

3034
h2spec:
3135
<<: *common
3236
command: /bin/bash -cl "./scripts/test_h2spec.sh"
3337

38+
test:
39+
<<: *common
40+
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors && ./scripts/integration_tests.sh && ./scripts/test_h2spec.sh"

0 commit comments

Comments
 (0)