Skip to content

Commit 4bf85d3

Browse files
committed
testing: update crate version to latest stable
1 parent 99b283c commit 4bf85d3

File tree

5 files changed

+24
-11
lines changed

5 files changed

+24
-11
lines changed

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ python:
77
- nightly
88
sudo:
99
false
10-
addons:
11-
apt:
12-
packages:
13-
- oracle-java8-set-default
10+
jdk:
11+
- openjdk11
12+
matrix:
13+
include:
14+
- jdk: openjdk11
15+
before_install:
16+
- rm "${JAVA_HOME}/lib/security/cacerts"
17+
- ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
1418
before_install:
1519
# clean existing dependencies to avoid clashes
1620
- pip freeze | xargs pip uninstall -y

src/crate/client/doctests/http.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,5 +201,5 @@ will be provided::
201201
... trace = 'TRACE: ' + str(e.error_trace)
202202

203203
>>> print(trace)
204-
TRACE: SQLActionException: BAD_REQUEST 4000 SQLParseException: ... mismatched input 'error' expecting {<EOF>, ...
205-
at io.crate.exceptions...
204+
TRACE: SQLActionException: 400 Bad Request 4000 SQLParseException: ... mismatched input 'error' expecting {<EOF>, ...
205+
at io.crate...

src/crate/client/doctests/https.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ invalid::
8080
>>> client.server_infos(crate_host)
8181
Traceback (most recent call last):
8282
...
83-
ConnectionError: Server not available, exception: ...[SSL: TLSV1_ALERT_UNKNOWN_CA]...
83+
ConnectionError: Server not available, exception: ...[SSL: ...
8484

src/crate/testing/doctests/layer.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,24 @@ From Uri
228228
The CrateLayer can also be created by providing a URI that points to a Crate
229229
tarball::
230230

231-
>>> uri = 'https://cdn.crate.io/downloads/releases/crate-2.1.7.tar.gz'
231+
>>> import configparser
232+
>>> config = configparser.ConfigParser()
233+
>>> config.read(os.path.join(os.getcwd(), "..", "..", "versions.cfg"))
234+
['.../versions.cfg']
235+
236+
>>> version = config["versions"]["crate_server"]
237+
238+
>>> uri = 'https://cdn.crate.io/downloads/releases/crate-{}.tar.gz'.format(version)
232239
>>> tmpdir = tempfile.mkdtemp()
233240
>>> layer = CrateLayer.from_uri(
234241
... uri, name='crate-uri', http_port=42203, directory=tmpdir)
235242
>>> layer.setUp()
236-
>>> os.path.exists(os.path.join(tmpdir, 'crate-2.1.7'))
243+
244+
>>> work_dir = os.path.join(tmpdir, 'crate-' + version)
245+
>>> os.path.exists(work_dir)
237246
True
238247

239248
>>> layer.tearDown()
240249

241-
>>> os.path.exists(os.path.join(tmpdir, 'crate-2.1.7'))
250+
>>> os.path.exists(work_dir)
242251
False

versions.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
crate_server = 2.3.5
2+
crate_server = 3.2.5
33

44
flake8 = 2.5.1
55
mccabe = 0.3.1

0 commit comments

Comments
 (0)