trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/testing' into feature/22-device-lot-visibility

This commit is contained in:
nad 2020-08-05 13:11:38 +02:00
parent cc17a32e12 0318105e84
commit 994f1d0e5f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/test_basic.py
View File

@ -51,6 +51,7 @@ def test_api_docs(client: Client):
'/documents/devices/', '/documents/devices/',
'/documents/erasures/', '/documents/erasures/',
'/documents/static/{filename}', '/documents/static/{filename}',
'/documents/stock/',
'/drills/{id}/merge/', '/drills/{id}/merge/',
'/graphic-cards/{id}/merge/', '/graphic-cards/{id}/merge/',
'/hard-drives/{id}/merge/', '/hard-drives/{id}/merge/',

2
tests/test_snapshot.py
View File

@ -291,7 +291,7 @@ def test_snapshot_different_properties_same_tags(user: UserClient, tag_id: str):
def test_snapshot_upload_twice_uuid_error(user: UserClient): def test_snapshot_upload_twice_uuid_error(user: UserClient):
pc1 = file('basic.snapshot') pc1 = file('basic.snapshot')
user.post(pc1, res=Snapshot) user.post(pc1, res=Snapshot)
user.post(pc1, res=Snapshot, status=DBError) user.post(pc1, res=Snapshot, status=UniqueViolation)
@pytest.mark.mvp @pytest.mark.mvp