vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

websocket: fix autobahn test to always use latest v(#6780)

pull/6785/head
Tomas Hellström 2020-11-08 17:46:06 +01:00 committed by GitHub
parent af5836202c
commit 68cfbd6d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.github/workflows/ci.yml vendored
View File

@ -518,38 +518,38 @@ jobs:
../v -autofree -experimental . ../v -autofree -experimental .
cd .. cd ..
# websocket_autobahn: websocket_autobahn:
# name: Autobahn integrations tests name: Autobahn integrations tests
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Checkout - name: Checkout
# uses: actions/checkout@v2 uses: actions/checkout@v2
# - name: Run autobahn services - name: Run autobahn services
# run: docker-compose -f ${{github.workspace}}/vlib/x/websocket/tests/autobahn/docker-compose.yml up -d run: docker-compose -f ${{github.workspace}}/vlib/x/websocket/tests/autobahn/docker-compose.yml up -d
# - name: Build client test - name: Build client test
# run: docker exec autobahn_client "v" "/src/tests/autobahn/autobahn_client.v" run: docker exec autobahn_client "/src/v" "/src/vlib/x/websocket/tests/autobahn/autobahn_client.v"
# - name: Run client test - name: Run client test
# run: docker exec autobahn_client "/src/tests/autobahn/autobahn_client" run: docker exec autobahn_client "/src/vlib/x/websocket/tests/autobahn/autobahn_client"
# - name: Run server test - name: Run server test
# run: docker exec autobahn_server "wstest" "-m" "fuzzingclient" "-s" "/config/fuzzingclient.json" run: docker exec autobahn_server "wstest" "-m" "fuzzingclient" "-s" "/config/fuzzingclient.json"
# - name: Copy reports - name: Copy reports
# run: docker cp autobahn_server:/reports ${{github.workspace}}/reports run: docker cp autobahn_server:/reports ${{github.workspace}}/reports
# - name: Test success - name: Test success
# run: docker exec autobahn_server "python" "/check_results.py" run: docker exec autobahn_server "python" "/check_results.py"
# - name: Publish all reports - name: Publish all reports
# uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
# with: with:
# name: full report name: full report
# path: ${{github.workspace}}/reports path: ${{github.workspace}}/reports
# - name: Publish report client - name: Publish report client
# uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
# with: with:
# name: client name: client
# path: ${{github.workspace}}/reports/clients/index.html path: ${{github.workspace}}/reports/clients/index.html
# - name: Publish report server - name: Publish report server
# uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
# with: with:
# name: server name: server
# path: ${{github.workspace}}/reports/servers/index.html path: ${{github.workspace}}/reports/servers/index.html

4
vlib/x/websocket/tests/autobahn/docker-compose.yml
View File

@ -11,8 +11,8 @@ services:
container_name: autobahn_client container_name: autobahn_client
build: build:
#vlib/x/websocket/tests/autobahn/ws_test/Dockerfile #vlib/x/websocket/tests/autobahn/ws_test/Dockerfile
dockerfile: tests/autobahn/ws_test/Dockerfile dockerfile: vlib/x/websocket/tests/autobahn/ws_test/Dockerfile
context: ../../ context: ../../../../../
# volumes: # volumes:
# - ../../:/src # - ../../:/src
# redis: # redis:

17
vlib/x/websocket/tests/autobahn/ws_test/Dockerfile
View File

@ -1,11 +1,12 @@
FROM thevlang/vlang:buster-dev FROM thevlang/vlang:buster-build
# ARG WORKSPACE_ROOT
# WORKDIR ${WORKSPACE_ROOT}
COPY ./ /src/ COPY ./ /src/
# COPY tests/autobahn/ws_test/run.sh /run.sh
# RUN chmod +x /run.sh WORKDIR /src
RUN v /src/tests/autobahn/autobahn_server.v
RUN chmod +x /src/tests/autobahn/autobahn_server RUN make CC=clang
ENTRYPOINT [ "/src/tests/autobahn/autobahn_server" ]
RUN /src/v /src/vlib/x/websocket/tests/autobahn/autobahn_server.v
RUN chmod +x /src/vlib/x/websocket/tests/autobahn/autobahn_server
ENTRYPOINT [ "/src/vlib/x/websocket/tests/autobahn/autobahn_server" ]