Correctly handle unique constraints

ereuse_devicehub/db.py

@@ -1,9 +1,8 @@
 from sqlalchemy.dialects import postgresql
-
+from teal.db import SchemaSQLAlchemy
-from teal.db import SQLAlchemy as _SQLAlchemy
 
 
-class SQLAlchemy(_SQLAlchemy):
+class SQLAlchemy(SchemaSQLAlchemy):
     """
     Superuser must create the required extensions in the public
     schema of the database, as it is in the `search_path`

ereuse_devicehub/resources/event/views.py

@@ -5,12 +5,12 @@ from uuid import UUID
 
 from flask import current_app as app, request
 from sqlalchemy.util import OrderedSet
+from teal.resource import View
 
 from ereuse_devicehub.db import db
 from ereuse_devicehub.resources.device.models import Component, Computer
 from ereuse_devicehub.resources.enums import SnapshotSoftware
 from ereuse_devicehub.resources.event.models import Event, Snapshot, WorkbenchRate
-from teal.resource import View
 
 
 class EventView(View):

setup.py

@@ -44,7 +44,7 @@ setup(
         'psycopg2-binary',
         'python-stdnum',
         'PyYAML',
-        'teal>=0.2.0a12',
+        'teal>=0.2.0a13',
         'requests',
         'requests-toolbelt',
         'sqlalchemy-utils[password, color, phone]',

tests/test_agent.py

@@ -1,15 +1,15 @@
 from uuid import UUID
 
 import pytest
-from sqlalchemy.exc import IntegrityError
 from sqlalchemy_utils import PhoneNumber
+from teal.db import UniqueViolation
+from teal.enums import Country
 
 from ereuse_devicehub.config import DevicehubConfig
 from ereuse_devicehub.db import db
 from ereuse_devicehub.devicehub import Devicehub
 from ereuse_devicehub.resources.agent import OrganizationDef, models, schemas
 from ereuse_devicehub.resources.agent.models import Membership, Organization, Person, System
-from teal.enums import Country
 from tests.conftest import app_context, create_user
 
 
@@ -79,7 +79,7 @@ def test_membership_repeated():
     db.session.add(person)
 
     person.member_of.add(Membership(org, person))
-    with pytest.raises(IntegrityError):
+    with pytest.raises(UniqueViolation):
         db.session.flush()
 
 
@@ -94,7 +94,7 @@ def test_membership_repeating_id():
     person2 = Person(name='Tommy')
     person2.member_of.add(Membership(org, person2, id='acme-1'))
     db.session.add(person2)
-    with pytest.raises(IntegrityError) as e:
+    with pytest.raises(UniqueViolation) as e:
         db.session.flush()
     assert 'One member id per organization' in str(e)
 

tests/test_snapshot.py

@@ -4,6 +4,7 @@ from typing import List, Tuple
 from uuid import uuid4
 
 import pytest
+from teal.db import UniqueViolation
 
 from ereuse_devicehub.client import UserClient
 from ereuse_devicehub.db import db
@@ -274,11 +275,10 @@ def test_snapshot_different_properties_same_tags(user: UserClient, tag_id: str):
     user.post(pc2, res=Snapshot, status=422)
 
 
-@pytest.mark.xfail(reason='duplicate Snapshot is a human error and needs a nice error message.')
 def test_snapshot_upload_twice_uuid_error(user: UserClient):
     pc1 = file('basic.snapshot')
     user.post(pc1, res=Snapshot)
-    user.post(pc1, res=Snapshot, status=422)
+    user.post(pc1, res=Snapshot, status=UniqueViolation)
 
 
 def test_erase(user: UserClient):

tests/test_tag.py

@@ -1,6 +1,7 @@
 import pytest
 from pytest import raises
-from sqlalchemy.exc import IntegrityError
+from teal.db import MultipleResourcesFound, ResourceNotFound, UniqueViolation
+from teal.marshmallow import ValidationError
 
 from ereuse_devicehub.client import UserClient
 from ereuse_devicehub.db import db
@@ -10,8 +11,6 @@ from ereuse_devicehub.resources.device.models import Desktop
 from ereuse_devicehub.resources.enums import ComputerChassis
 from ereuse_devicehub.resources.tag import Tag
 from ereuse_devicehub.resources.tag.view import CannotCreateETag, TagNotLinked
-from teal.db import MultipleResourcesFound, ResourceNotFound
-from teal.marshmallow import ValidationError
 from tests import conftest
 
 
@@ -49,7 +48,7 @@ def test_create_two_same_tags():
     """Ensures there cannot be two tags with the same ID and organization."""
     db.session.add(Tag(id='foo-bar'))
     db.session.add(Tag(id='foo-bar'))
-    with raises(IntegrityError):
+    with raises(UniqueViolation):
         db.session.commit()
     db.session.rollback()
     # And it works if tags are in different organizations