Skip to content

Commit 25dcc28

Browse files
committed
Update ArangoDB Docker version and use system DB for calling server log API in tests
1 parent 034e57b commit 25dcc28

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ python:
88
services:
99
- docker
1010
before_install:
11-
- docker create --name arango -p 8529:8529 -e ARANGO_ROOT_PASSWORD=passwd arangodb/arangodb-preview:3.7-alpha.3 --server.jwt-secret-keyfile=/tmp/keyfile
11+
- docker create --name arango -p 8529:8529 -e ARANGO_ROOT_PASSWORD=passwd arangodb/arangodb-preview:3.7.1-rc.1 --server.jwt-secret-keyfile=/tmp/keyfile
1212
- docker cp tests/static/service.zip arango:/tmp/service.zip
1313
- docker cp tests/static/keyfile arango:/tmp/keyfile
1414
- docker start arango

tests/test_database.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ def test_database_misc_methods(sys_db, db, bad_db):
151151
assert err.value.error_code in {11, 1228}
152152

153153
# Test read_log with default parameters
154-
log = db.read_log(upto='fatal')
154+
log = sys_db.read_log(upto='fatal')
155155
assert 'lid' in log
156156
assert 'level' in log
157157
assert 'text' in log
158158
assert 'total_amount' in log
159159

160160
# Test read_log with specific parameters
161-
log = db.read_log(
161+
log = sys_db.read_log(
162162
level='error',
163163
start=0,
164164
size=100000,
@@ -185,7 +185,7 @@ def test_database_misc_methods(sys_db, db, bad_db):
185185
assert err.value.error_code in {11, 1228}
186186

187187
# Test get log levels
188-
assert isinstance(db.log_levels(), dict)
188+
assert isinstance(sys_db.log_levels(), dict)
189189

190190
# Test get log levels with bad database
191191
with assert_raises(ServerLogLevelError) as err:
@@ -198,10 +198,10 @@ def test_database_misc_methods(sys_db, db, bad_db):
198198
'collector': 'INFO',
199199
'threads': 'WARNING'
200200
}
201-
result = db.set_log_levels(**new_levels)
201+
result = sys_db.set_log_levels(**new_levels)
202202
for key, value in new_levels.items():
203203
assert result[key] == value
204-
for key, value in db.log_levels().items():
204+
for key, value in sys_db.log_levels().items():
205205
assert result[key] == value
206206

207207
# Test set log levels with bad database

0 commit comments

Comments
 (0)