8460: Use new ws server for integration tests only if ARVADOS_TEST_EXPERIMENTAL_WS...

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 75b4f4d26dee608468a4ed587d26f7c6bc61c175..b969b12a7abc6374ae0993d0d95c2f5cf85f784b 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -294,7 +294,10 @@ def run(leave_running_atexit=False):
     env = os.environ.copy()
     env['RAILS_ENV'] = 'test'
     env['ARVADOS_TEST_WSS_PORT'] = str(wss_port)
-    env.pop('ARVADOS_WEBSOCKETS', None)
+    if env.get('ARVADOS_TEST_EXPERIMENTAL_WS'):
+        env.pop('ARVADOS_WEBSOCKETS', None)
+    else:
+        env['ARVADOS_WEBSOCKETS'] = 'yes'
     env.pop('ARVADOS_TEST_API_HOST', None)
     env.pop('ARVADOS_API_HOST', None)
     env.pop('ARVADOS_API_HOST_INSECURE', None)

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index ab560d7f6b79724a9a3ff1a22f6a413e16eb18c4..b2a16021036e5a22b63375af71b7d2292c1c7f36 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -444,4 +444,6 @@ test:
   workbench_address: https://localhost:3001/
   git_repositories_dir: <%= Rails.root.join 'tmp', 'git', 'test' %>
   git_internal_dir: <%= Rails.root.join 'tmp', 'internal.git' %>
+  <% if ENV['ARVADOS_TEST_EXPERIMENTAL_WS'] %>
   websocket_address: "wss://0.0.0.0:<%= ENV['ARVADOS_TEST_WSS_PORT'] %>/websocket"
+  <% end %>