Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move node conformance tests to a common package #951

Merged
merged 51 commits into from
Dec 7, 2023
Merged

Move node conformance tests to a common package #951

Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
9f4878e
Add `connect-node-conformance` with server implementation
srikrsna-buf Oct 27, 2023
3c5ffcf
suggestions
srikrsna-buf Oct 30, 2023
ac63f0d
Update server implementation
srikrsna-buf Nov 16, 2023
9164764
Bin
srikrsna-buf Nov 20, 2023
083a1e0
gen; fix tls
srikrsna-buf Nov 21, 2023
c8aafb7
lockfile
srikrsna-buf Nov 21, 2023
44dddbf
Client without bidi
srikrsna-buf Oct 27, 2023
3b7cb9b
Add bidi case
srikrsna-buf Oct 27, 2023
e72d26a
Without TLS
srikrsna-buf Nov 22, 2023
6fee56f
fmt
srikrsna-buf Nov 22, 2023
062a865
Merge branch 'conformance/server' into conformance/client
srikrsna-buf Nov 22, 2023
7957f5a
Without TLS
srikrsna-buf Nov 22, 2023
b030faf
lockfile
srikrsna-buf Nov 22, 2023
a28e43c
suggestions and match ref
srikrsna-buf Nov 22, 2023
5a3c087
TLS
srikrsna-buf Nov 22, 2023
3425409
Merge branch 'conformance/server' into conformance/client
srikrsna-buf Nov 22, 2023
da37d5e
Client certs
srikrsna-buf Nov 22, 2023
1be652f
Client certs
srikrsna-buf Nov 22, 2023
0dfdc3c
Merge branch 'conformance/server' into conformance/client
srikrsna-buf Nov 22, 2023
cd9b414
Update packages/connect-node-conformance/src/protocol.ts
srikrsna-buf Nov 22, 2023
9f6e978
Merge remote-tracking branch 'origin/conformance/server' into conform…
srikrsna-buf Nov 22, 2023
9b72255
Seperate headers
srikrsna-buf Nov 24, 2023
f71bc10
Add `connect-node-conformance` with server implementation
srikrsna-buf Oct 27, 2023
5a0137c
suggestions
srikrsna-buf Oct 30, 2023
d8c434d
Update server implementation
srikrsna-buf Nov 16, 2023
a08d1b7
Bin
srikrsna-buf Nov 20, 2023
fdd9ae7
gen; fix tls
srikrsna-buf Nov 21, 2023
78a324d
lockfile
srikrsna-buf Nov 21, 2023
095fe88
fmt
srikrsna-buf Nov 22, 2023
18a5bc9
suggestions and match ref
srikrsna-buf Nov 22, 2023
44d8e69
Client certs
srikrsna-buf Nov 22, 2023
6e606f2
Update packages/connect-node-conformance/src/protocol.ts
srikrsna-buf Nov 22, 2023
5677a49
Add to CI
srikrsna-buf Nov 30, 2023
c6ff2fe
typo
srikrsna-buf Nov 30, 2023
33a6b0a
fetch
srikrsna-buf Nov 30, 2023
26dd6cb
readme
srikrsna-buf Nov 30, 2023
5b2273b
Treat ResponseDefinition as optional
srikrsna-buf Nov 30, 2023
9fed973
typo
srikrsna-buf Nov 30, 2023
5cca796
Remove zlib
srikrsna-buf Nov 30, 2023
72e672e
Merge remote-tracking branch 'origin/conformance/server' into conform…
srikrsna-buf Nov 30, 2023
9f6023a
CI
srikrsna-buf Nov 30, 2023
dba8bfc
fmt
srikrsna-buf Nov 30, 2023
e79cdfa
Merge remote-tracking branch 'origin/main' into conformance/server
srikrsna-buf Nov 30, 2023
4206496
Merge remote-tracking branch 'origin/conformance/server' into conform…
srikrsna-buf Nov 30, 2023
19e2253
Move to common conformance package
srikrsna-buf Dec 1, 2023
72df9b6
mv transport
srikrsna-buf Dec 1, 2023
0a38364
Merge remote-tracking branch 'origin/main' into conformance/rename
srikrsna-buf Dec 7, 2023
4cba3f5
Merge
srikrsna-buf Dec 7, 2023
f61804f
rename pkg
srikrsna-buf Dec 7, 2023
cb28646
fmt
srikrsna-buf Dec 7, 2023
e6b65e5
Match connect-versions
srikrsna-buf Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ $(BUILD)/connect-node-test: $(BUILD)/connect-node $(BUILD)/connect-fastify $(BUI
@mkdir -p $(@D)
@touch $(@)

$(BUILD)/connect-conformance: $(BUILD)/connect-node $(GEN)/connect-conformance packages/connect-conformance/tsconfig.json $(shell find packages/connect-conformance/src -name '*.ts')
npm run -w packages/connect-conformance clean
npm run -w packages/connect-conformance build
@mkdir -p $(@D)
@touch $(@)

$(BUILD)/example: $(GEN)/example $(BUILD)/connect-web packages/example/tsconfig.json $(shell find packages/example/src -name '*.ts')
npm run -w packages/example lint
@mkdir -p $(@D)
Expand Down Expand Up @@ -149,6 +155,12 @@ $(GEN)/connect-node-test: node_modules/.bin/protoc-gen-es $(BUILD)/protoc-gen-co
@mkdir -p $(@D)
@touch $(@)

$(GEN)/connect-conformance: node_modules/.bin/protoc-gen-es $(BUILD)/protoc-gen-connect-es packages/connect-conformance/buf.gen.yaml packages/connect-conformance/package.json Makefile
rm -rf packages/connect-conformance/src/gen/*
npm run -w packages/connect-conformance generate
@mkdir -p $(@D)
@touch $(@)

$(GEN)/connect-web-bench: node_modules/.bin/protoc-gen-es $(BUILD)/protoc-gen-connect-es packages/connect-web-bench/buf.gen.yaml Makefile
rm -rf packages/connect-web-bench/src/gen/*
npm run -w packages/connect-web-bench generate buf.build/connectrpc/eliza:8bde2b90ec0a7f23df3de5824bed0b6ea2043305
Expand Down Expand Up @@ -178,7 +190,7 @@ clean: conformanceserverstop ## Delete build artifacts and installed dependencie
build: $(BUILD)/connect $(BUILD)/connect-web $(BUILD)/connect-node $(BUILD)/connect-fastify $(BUILD)/connect-express $(BUILD)/connect-next $(BUILD)/protoc-gen-connect-es $(BUILD)/example $(BUILD)/connect-migrate ## Build

.PHONY: test
test: testconnectpackage testconnectnodepackage testnode testwebnode testwebbrowser testconnectmigrate ## Run all tests, except browserstack
test: testconnectpackage testconnectnodepackage testnode testconformance testwebnode testwebbrowser testconnectmigrate ## Run all tests, except browserstack

.PHONY: testconnectpackage
testconnectpackage: $(BUILD)/connect
Expand All @@ -200,6 +212,22 @@ testnode: $(BIN)/node16 $(BIN)/node18 $(BIN)/node20 $(BIN)/node21 $(BUILD)/conne
cd packages/connect-node-test && PATH="$(abspath $(BIN)):$(PATH)" node21 --trace-warnings ../../node_modules/.bin/jasmine --config=jasmine.json
$(MAKE) conformanceserverstop

.PHONY: testconformance
testconformance: testnodeconformance

.PHONY: testnodeconformance
testnodeconformance: $(BIN)/node16 $(BIN)/node18 $(BIN)/node20 $(BIN)/node21 $(BUILD)/connect-conformance
# Server
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node16 ./bin/connectconformance --mode server --conf conformance-node.yaml -v ./bin/conformancenodeserver
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node18 ./bin/connectconformance --mode server --conf conformance-node.yaml -v ./bin/conformancenodeserver
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node20 ./bin/connectconformance --mode server --conf conformance-node.yaml -v ./bin/conformancenodeserver
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node21 ./bin/connectconformance --mode server --conf conformance-node.yaml -v ./bin/conformancenodeserver
# Client
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node16 ./bin/connectconformance --mode client --conf conformance-node.yaml -v ./bin/conformancenodeclient
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node18 ./bin/connectconformance --mode client --conf conformance-node.yaml -v ./bin/conformancenodeclient
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node20 ./bin/connectconformance --mode client --conf conformance-node.yaml -v ./bin/conformancenodeclient
cd packages/connect-conformance && PATH="$(abspath $(BIN)):$(PATH)" node21 ./bin/connectconformance --mode client --conf conformance-node.yaml -v ./bin/conformancenodeclient

.PHONY: testwebnode
testwebnode: $(BIN)/node18 $(BIN)/node20 $(BIN)/node21 $(BUILD)/connect-web-test
$(MAKE) conformanceserverrun
Expand Down
Loading