From 92d4b8b649fadc54e9781c8f332f96a3b7588d1c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 6 Oct 2020 14:21:09 +0100
Subject: [PATCH] tests: re-enable docker tests in travis (#4395)

Thanks to node10 having better support we can re-enable these tests.
---
 .travis.yml                     | 30 ++++++++++++++----------------
 tests/frontend/travis/runner.sh |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2fab80ceb..4891db8fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,14 +47,13 @@ jobs:
         - "cd src && npm install && cd -"
       script:
         - "tests/frontend/travis/runnerBackend.sh"
-## Temporarily commented out the Dockerfile tests
-#    - name: "Test the Dockerfile"
-#      install:
-#        - "cd src && npm install && cd -"
-#      script:
-#        - "docker build -t etherpad:test ."
-#        - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
-#        - "cd src && npm run test-container"
+    - name: "Test the Dockerfile"
+      install:
+        - "cd src && npm install && cd -"
+      script:
+        - "docker build -t etherpad:test ."
+        - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
+        - "cd src && npm run test-container"
     - name: "Load test Etherpad without Plugins"
       install:
         - "bin/installDeps.sh"
@@ -83,14 +82,13 @@ jobs:
         - "cd src && npm install && cd -"
       script:
         - "tests/frontend/travis/runnerBackend.sh"
-## Temporarily commented out the Dockerfile tests
-#    - name: "Test the Dockerfile"
-#      install:
-#        - "cd src && npm install && cd -"
-#      script:
-#        - "docker build -t etherpad:test ."
-#        - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
-#        - "cd src && npm run test-container"
+    - name: "Test the Dockerfile"
+      install:
+        - "cd src && npm install && cd -"
+      script:
+        - "docker build -t etherpad:test ."
+        - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
+        - "cd src && npm run test-container"
     - name: "Load test Etherpad with Plugins"
       install:
         - "bin/installDeps.sh"
diff --git a/tests/frontend/travis/runner.sh b/tests/frontend/travis/runner.sh
index ffc6bbd5b..bbb4680d1 100755
--- a/tests/frontend/travis/runner.sh
+++ b/tests/frontend/travis/runner.sh
@@ -16,7 +16,7 @@ cd "${MY_DIR}/../../../"
 # This is possible because the "install" section of .travis.yml already contains
 # a call to bin/installDeps.sh
 echo "Running Etherpad directly, assuming bin/installDeps.sh has already been run"
-node node_modules/ep_etherpad-lite/node/server.js "${@}" &
+node node_modules/ep_etherpad-lite/node/server.js --experimental-worker "${@}" &
 
 echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9001"