From 68cfbd6d66bdf5e8491d94b2c9c15e7207f60d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20Hellstr=C3=B6m?= <tomas.hellstrom@yahoo.se>
Date: Sun, 8 Nov 2020 17:46:06 +0100
Subject: [PATCH] websocket: fix autobahn test to always use latest v(#6780)

---
 .github/workflows/ci.yml                      | 66 +++++++++----------
 .../tests/autobahn/docker-compose.yml         |  4 +-
 .../tests/autobahn/ws_test/Dockerfile         | 17 ++---
 3 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cf53ec8a5..b7d6063314 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -518,38 +518,38 @@ jobs:
         ../v -autofree -experimental .
         cd ..
 
-  # websocket_autobahn:
-  #   name: Autobahn integrations tests
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
+  websocket_autobahn:
+    name: Autobahn integrations tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-  #     - name: Run autobahn services
-  #       run: docker-compose -f ${{github.workspace}}/vlib/x/websocket/tests/autobahn/docker-compose.yml up -d
-  #     - name: Build client test
-  #       run: docker exec autobahn_client "v" "/src/tests/autobahn/autobahn_client.v"
-  #     - name: Run client test
-  #       run: docker exec autobahn_client "/src/tests/autobahn/autobahn_client"
-  #     - name: Run server test
-  #       run: docker exec autobahn_server "wstest" "-m" "fuzzingclient" "-s" "/config/fuzzingclient.json"
-  #     - name: Copy reports
-  #       run: docker cp autobahn_server:/reports ${{github.workspace}}/reports
-  #     - name: Test success
-  #       run: docker exec autobahn_server "python" "/check_results.py"
+      - name: Run autobahn services
+        run: docker-compose -f ${{github.workspace}}/vlib/x/websocket/tests/autobahn/docker-compose.yml up -d
+      - name: Build client test
+        run: docker exec autobahn_client "/src/v" "/src/vlib/x/websocket/tests/autobahn/autobahn_client.v"
+      - name: Run client test
+        run: docker exec autobahn_client "/src/vlib/x/websocket/tests/autobahn/autobahn_client"
+      - name: Run server test
+        run: docker exec autobahn_server "wstest" "-m" "fuzzingclient" "-s" "/config/fuzzingclient.json"
+      - name: Copy reports
+        run: docker cp autobahn_server:/reports ${{github.workspace}}/reports
+      - name: Test success
+        run: docker exec autobahn_server "python" "/check_results.py"
 
-  #     - name: Publish all reports
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #           name: full report
-  #           path: ${{github.workspace}}/reports
-  #     - name: Publish report client
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #           name: client
-  #           path: ${{github.workspace}}/reports/clients/index.html
-  #     - name: Publish report server
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #           name: server
-  #           path: ${{github.workspace}}/reports/servers/index.html
+      - name: Publish all reports
+        uses: actions/upload-artifact@v2
+        with:
+            name: full report
+            path: ${{github.workspace}}/reports
+      - name: Publish report client
+        uses: actions/upload-artifact@v2
+        with:
+            name: client
+            path: ${{github.workspace}}/reports/clients/index.html
+      - name: Publish report server
+        uses: actions/upload-artifact@v2
+        with:
+            name: server
+            path: ${{github.workspace}}/reports/servers/index.html
diff --git a/vlib/x/websocket/tests/autobahn/docker-compose.yml b/vlib/x/websocket/tests/autobahn/docker-compose.yml
index 0c1b62eebd..c982a321db 100644
--- a/vlib/x/websocket/tests/autobahn/docker-compose.yml
+++ b/vlib/x/websocket/tests/autobahn/docker-compose.yml
@@ -11,8 +11,8 @@ services:
     container_name: autobahn_client
     build: 
       #vlib/x/websocket/tests/autobahn/ws_test/Dockerfile
-      dockerfile: tests/autobahn/ws_test/Dockerfile 
-      context: ../../
+      dockerfile: vlib/x/websocket/tests/autobahn/ws_test/Dockerfile 
+      context: ../../../../../
     # volumes: 
     #   - ../../:/src
 #   redis:
diff --git a/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile b/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile
index 62ace99af3..a53f112c75 100644
--- a/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile
+++ b/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile
@@ -1,11 +1,12 @@
-FROM thevlang/vlang:buster-dev
+FROM thevlang/vlang:buster-build
 
-# ARG WORKSPACE_ROOT
 
-# WORKDIR ${WORKSPACE_ROOT}
 COPY ./ /src/
-# COPY tests/autobahn/ws_test/run.sh /run.sh
-# RUN chmod +x /run.sh
-RUN v /src/tests/autobahn/autobahn_server.v
-RUN chmod +x /src/tests/autobahn/autobahn_server
-ENTRYPOINT [ "/src/tests/autobahn/autobahn_server" ]
+
+WORKDIR /src
+
+RUN make CC=clang 
+
+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" ]