From df08155560939d161e9cdaa3103fe23f30e47dd6 Mon Sep 17 00:00:00 2001
From: Antonio Barcelos <antonio.barcelos@neo4j.com>
Date: Thu, 11 Feb 2021 19:19:05 +0100
Subject: [PATCH 1/2] testkit: Update NodeJS version in the Dockerfile

The support for the `NodeJS 8.x` was dropped and the `npm update` was failing because of that.
The NodeJS updagrade is being done to `10.x` since it's the oldest version in maintenance.
This update was done by updating the Ubuntu version since the other of updates was broken the TLS configuration. Along with this, the TLS 1.0 was enable in the OpenSSL config since it's disable by default in this ubuntu's version.
---
 testkit/Dockerfile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/testkit/Dockerfile b/testkit/Dockerfile
index a791f7b41..438336155 100644
--- a/testkit/Dockerfile
+++ b/testkit/Dockerfile
@@ -1,19 +1,31 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
     apt-get install -y \
         git \
         curl \
         python3 \
-        firefox \
         nodejs \
-        npm \
+        npm \ 
+        firefox \
     && rm -rf /var/lib/apt/lists/*
 
 RUN npm install -g npm \
     && /bin/bash -c 'hash -d npm'
 RUN npm install -g gulp
 
+# Enable tls v1.0
+RUN echo "openssl_conf = openssl_configuration\n"|cat - /etc/ssl/openssl.cnf > /tmp/openssl_conf.cnf \  
+    && mv /tmp/openssl_conf.cnf /etc/ssl/openssl.cnf  
+RUN echo "[openssl_configuration]\n\
+ssl_conf = ssl_configuration\n\
+[ssl_configuration]\n\
+system_default = tls_system_default\n\
+[tls_system_default]\n\
+CipherString = DEFAULT:@SECLEVEL=1" >> /etc/ssl/openssl.cnf 
+
 # Install our own CAs on the image.
 # Assumes Linux Debian based image.
 COPY CAs/* /usr/local/share/ca-certificates/

From 82e9d529fb996ceca0d59cbc90f268d1162ceb12 Mon Sep 17 00:00:00 2001
From: Antonio Barcelos <antonio.barcelos@neo4j.com>
Date: Fri, 19 Feb 2021 12:13:49 +0100
Subject: [PATCH 2/2] Small fixes to the integration test to make it supports
 the server 4.3

---
 test/rx/transaction.test.js | 2 +-
 test/session.test.js        | 3 ++-
 testkit/stress.py           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/rx/transaction.test.js b/test/rx/transaction.test.js
index 199421df1..6e33321b0 100644
--- a/test/rx/transaction.test.js
+++ b/test/rx/transaction.test.js
@@ -693,7 +693,7 @@ describe('#integration-rx transaction', () => {
       .toPromise()
     expect(result).toEqual([
       Notification.createError(
-        jasmine.stringMatching(/Unexpected end of input/)
+        jasmine.stringMatching(/Unexpected end of input|Invalid input/)
       )
     ])
   }
diff --git a/test/session.test.js b/test/session.test.js
index 6e4713099..1fb197828 100644
--- a/test/session.test.js
+++ b/test/session.test.js
@@ -387,13 +387,14 @@ describe('#integration session', () => {
               'Query failed after a long running query was terminated',
               error
             )
+            done.fail.bind(done)
           })
       })
 
     // wait some time than close the session with a long running query
     setTimeout(() => {
       session.close().catch(done.fail.bind(done))
-    }, 1000)
+    }, 200)
   }, 70000)
 
   /* flaky
diff --git a/testkit/stress.py b/testkit/stress.py
index 530b9d619..d61305fed 100644
--- a/testkit/stress.py
+++ b/testkit/stress.py
@@ -11,4 +11,4 @@ def run(args):
     os.environ['STRESS_TEST_MODE'] = 'fastest'
     os.environ['RUNNING_TIME_IN_SECONDS'] = \
         os.environ.get('TEST_NEO4J_STRESS_DURATION', 0)
-    run(["npm", "run", "run-stress-tests"])
+    run(["gulp", "run-stress-tests-without-jasmine"])