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/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/ 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"])