Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/rx/transaction.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
)
])
}
Expand Down
3 changes: 2 additions & 1 deletion test/session.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 15 additions & 3 deletions testkit/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion testkit/stress.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])