Skip to content

Commit 6456e46

Browse files
committed
Disable warning for non-main thread detection in conformance tests and update README for stable test command
1 parent c95b782 commit 6456e46

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ DOCKER_BUILD_CMD = docker build -f conformance-build/Dockerfile . --progress=pla
55
build-conformance:
66
sbt conformance/stage
77

8-
.PHONY: test-conformance-netty-server
9-
test-conformance-netty-server: build-conformance
10-
@echo "Running conformance tests for netty server"
11-
$(DOCKER_BUILD_CMD) --build-arg launcher=NettyServerLauncher --build-arg config=suite-netty.yaml --build-arg parallel_args="--parallel 1"
12-
@code=$$(cat out/exit_code | tr -d '\n'); echo "Exiting with code: $$code"; exit $$code
13-
148
.PHONY: test-conformance-http4s-server
159
test-conformance-http4s-server: build-conformance
1610
@echo "Running conformance tests for http4s server"
@@ -29,5 +23,13 @@ test-conformance-http4s-client: build-conformance
2923
$(DOCKER_BUILD_CMD) --build-arg launcher=Http4sClientLauncher --build-arg config=suite-http4s-client.yaml --build-arg mode=client
3024
@code=$$(cat out/exit_code | tr -d '\n'); echo "Exiting with code: $$code"; exit $$code
3125

26+
.PHONY: test-conformance-netty-server
27+
test-conformance-netty-server: build-conformance
28+
@echo "Running conformance tests for netty server"
29+
$(DOCKER_BUILD_CMD) --build-arg launcher=NettyServerLauncher --build-arg config=suite-netty.yaml --build-arg parallel_args="--parallel 1"
30+
@code=$$(cat out/exit_code | tr -d '\n'); echo "Exiting with code: $$code"; exit $$code
31+
3232
.PHONY: test-conformance-stable
33-
test-conformance-stable: test-conformance-http4s-server test-conformance-http4s-client test-conformance-netty-server
33+
test-conformance-stable: test-conformance-http4s-server \
34+
test-conformance-http4s-client \
35+
test-conformance-netty-server

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -259,16 +259,8 @@ How-tos that go beyond the basic usage:
259259

260260
Run the following command to run Connect-RPC conformance tests:
261261

262-
For the Netty server:
263-
264-
```shell
265-
make test-conformance profile=netty-server
266-
```
267-
268-
For the Http4s server:
269-
270262
```shell
271-
make test-conformance profile=http4s-server
263+
make test-conformance-stable
272264
```
273265

274266
Execution results are output to STDOUT.

conformance-build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN LOGS_PATH="/out" \
2323
$parallel_args \
2424
-v -vv --trace \
2525
-- \
26-
/app/bin/conformance -main org.ivovk.connect_rpc_scala.conformance.$launcher; \
26+
/app/bin/conformance -main org.ivovk.connect_rpc_scala.conformance.$launcher -Dcats.effect.warnOnNonMainThreadDetected=false; \
2727
echo $? > /out/exit_code
2828

2929
FROM scratch AS export

0 commit comments

Comments
 (0)