Skip to content

Commit 49ddf39

Browse files
committed
Disable backup API tests and use ArangoDB 3.7 in travis.yml
1 parent 0163b01 commit 49ddf39

File tree

5 files changed

+26
-8
lines changed

5 files changed

+26
-8
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 -e ARANGO_LICENSE_KEY=EVALUATION:125f16ada6047bd17eeeefa3f011070510b5fbd9d85122afdeca72c380e7ac83 arangodb/enterprise-preview:3.7.1-rc.1 --server.jwt-secret-keyfile=/tmp/keyfile
11+
- docker create --name arango -p 8529:8529 -e ARANGO_ROOT_PASSWORD=passwd arangodb/arangodb:3.7.2 --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

arango/backup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from arango.request import Request
2020

2121

22-
class Backup(APIWrapper):
22+
class Backup(APIWrapper): # pragma: no cover
2323

2424
def __init__(self, connection, executor):
2525
super(Backup, self).__init__(connection, executor)
@@ -242,7 +242,7 @@ def restore(self, backup_id):
242242
)
243243

244244
def response_handler(resp):
245-
if resp.is_success: # pragma: no cover
245+
if resp.is_success:
246246
return format_backup_restore(resp.body['result'])
247247
raise BackupRestoreError(resp, request)
248248

tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ def pytest_unconfigure(*_): # pragma: no cover
144144
if col_name.startswith('test_collection'):
145145
sys_db.delete_collection(col_name, ignore_missing=True)
146146

147-
# Remove all backups.
148-
for backup_id in sys_db.backup.get()['list'].keys():
149-
sys_db.backup.delete(backup_id)
147+
# # Remove all backups.
148+
# for backup_id in sys_db.backup.get()['list'].keys():
149+
# sys_db.backup.delete(backup_id)
150150

151151

152152
# noinspection PyProtectedMember

tests/test_backup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import absolute_import, unicode_literals
22

3+
import pytest
34
from six import string_types
45

56
from arango.errno import (
@@ -19,6 +20,8 @@
1920

2021

2122
def test_backup_management(sys_db, bad_db):
23+
pytest.skip('Only for ArangoDB enterprise edition')
24+
2225
# Test create backup "foo".
2326
result = sys_db.backup.create(
2427
label='foo',
@@ -112,8 +115,8 @@ def test_backup_management(sys_db, bad_db):
112115
assert err.value.error_code in {FORBIDDEN, DATABASE_NOT_FOUND}
113116

114117
# Test restore backup.
115-
# result = sys_db.backup.restore(backup_id_foo)
116-
# assert isinstance(result, dict)
118+
result = sys_db.backup.restore(backup_id_foo)
119+
assert isinstance(result, dict)
117120

118121
# Test restore backup with bad database.
119122
with assert_raises(BackupRestoreError) as err:

tests/test_database.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
from six import string_types
66

7+
from arango.aql import AQL
8+
from arango.backup import Backup
9+
from arango.cluster import Cluster
710
from arango.exceptions import (
811
DatabaseCreateError,
912
DatabaseDeleteError,
@@ -24,6 +27,10 @@
2427
ServerVersionError,
2528
ServerEngineError,
2629
)
30+
from arango.foxx import Foxx
31+
from arango.pregel import Pregel
32+
from arango.replication import Replication
33+
from arango.wal import WAL
2734
from tests.helpers import assert_raises, generate_db_name
2835

2936

@@ -35,6 +42,14 @@ def test_database_attributes(db, username):
3542
assert db.conn is not None
3643
assert repr(db) == '<StandardDatabase {}>'.format(db.name)
3744

45+
assert isinstance(db.aql, AQL)
46+
assert isinstance(db.backup, Backup)
47+
assert isinstance(db.cluster, Cluster)
48+
assert isinstance(db.foxx, Foxx)
49+
assert isinstance(db.pregel, Pregel)
50+
assert isinstance(db.replication, Replication)
51+
assert isinstance(db.wal, WAL)
52+
3853

3954
def test_database_misc_methods(sys_db, db, bad_db):
4055
# Test get properties

0 commit comments

Comments
 (0)