Migrate crosstests to use testcontainers #84
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead of manually having to exclude tests from `./gradlew build` (since the crosstest tests fail if the Docker server isn't running), migrate the crosstests to use testcontainers to spin up the server so the tests can always run. This also simplifies the makefile - we no longer need to manually start/stop the crosstests server and also don't need to bind to static ports on the host - it will use ephemeral ports.
pkwarren
commented
Aug 31, 2023
| @@ -26,7 +25,7 @@ $(BIN)/license-headers: Makefile | |||
|
|
|||
| .PHONY: build | |||
| build: generate ## Build the entire project. | |||
| ./gradlew $(GRADLE_ARGS) build -x test | |||
There was a problem hiding this comment.
@smallsamantha - I noticed there were real compile errors in the tests which weren't getting reported in any of the CI checks as part of #79. This should resolve that.
| docker run --rm --name serverconnect -p 8080:8080 -p 8081:8081 -d \ | ||
| bufbuild/connect-crosstest:$(CROSSTEST_VERSION) \ | ||
| /usr/local/bin/serverconnect --h1port "8080" --h2port "8081" --cert "cert/localhost.crt" --key "cert/localhost.key" | ||
| docker run --rm --name servergrpc -p 8083:8083 -d \ |
There was a problem hiding this comment.
NOTE: I never saw anything connect to anything other than the h2port of the connect server. If we want to extend the tests to hit the gRPC server we should do that.
| } | ||
|
|
||
| @Before | ||
| fun before() { | ||
| val port = 8081 | ||
| val host = "https://localhost:$port" | ||
| val host = "https://localhost:${CROSSTEST_CONTAINER.getMappedPort(8081)}" |
There was a problem hiding this comment.
This will use an ephemeral port so it won't fail if something else is bound to 8080/8081.
stefanvanburen
approved these changes
Aug 31, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of manually having to exclude tests from
./gradlew build(since the crosstest tests fail if the Docker server isn't running), migrate the crosstests to use testcontainers to spin up the server so the tests can always run. This also simplifies the makefile - we no longer need to manually start/stop the crosstests server and also don't need to bind to static ports on the host - it will use ephemeral ports.