fixing tests

ereuse_devicehub/resources/device/models.py

@@ -6,6 +6,7 @@ from fractions import Fraction
 from itertools import chain
 from operator import attrgetter
 from typing import Dict, List, Set
+from flask_sqlalchemy import event
 
 from boltons import urlutils
 from citext import CIText
@@ -1176,5 +1177,4 @@ def create_code_tag(mapper, connection, device):
     db.session.add(tag)
 
 
-from flask_sqlalchemy import event
 event.listen(Device, 'after_insert', create_code_tag, propagate=True)

tests/test_documents.py

@@ -251,13 +251,13 @@ def test_check_insert_hash(app: Devicehub, user: UserClient, client: Client):
     assert ReportHash.query.filter_by(hash3=hash3).count() == 1
     result, status = client.get(res=documents.DocumentDef.t, item='check/', query=[('hash', hash3)])
     assert status.status_code == 200
-    assert result == True
+    assert result
 
     ff = open('/tmp/test.csv', 'w')
     ff.write(csv_str)
     ff.close()
 
-    a= open('/tmp/test.csv').read()
+    a = open('/tmp/test.csv').read()
     assert hash3 == hashlib.sha3_256(a.encode('utf-8')).hexdigest()
 
 
@@ -268,10 +268,7 @@ def test_export_extended(app: Devicehub, user: UserClient):
     snapshot2, _ = user.post(file('complete.export.snapshot'), res=Snapshot, status=201)
     with app.app_context():
         # Create a pc with a tag
-        tag = Tag(id='foo', owner_id=user.user['id'])
-        # pc = Desktop(serial_number='sn1', chassis=ComputerChassis.Tower, owner_id=user.user['id'])
         pc = d.Device.query.filter_by(id=snapshot1['device']['id']).first()
-        pc.tags.add(tag)
         db.session.add(pc)
         db.session.commit()
 

tests/test_lot.py

@@ -361,6 +361,7 @@ def test_lot_post_add_remove_device_view(app: Devicehub, user: UserClient):
     """
     # todo check with components
     with app.app_context():
+        g.user = User.query.one()
         device = Desktop(serial_number='foo',
                          model='bar',
                          manufacturer='foobar',
@@ -391,9 +392,11 @@ def test_lot_post_add_remove_device_view(app: Devicehub, user: UserClient):
 @pytest.mark.mvp
 @pytest.mark.usefixtures(conftest.app_context.__name__)
 def test_lot_error_add_device_from_other_user(user: UserClient):
+    # TODO
     """Tests adding a device to a lot using POST and
     removing it with DELETE.
     """
+    g.user = User.query.one()
     user2 = User(email='baz@baz.cxm', password='baz')
     user2.individuals.add(Person(name='Tommy'))
     db.session.add(user2)

tests/test_metrics.py

@@ -135,7 +135,7 @@ def test_metrics_action_status(user: UserClient, user2: UserClient):
                           accept='text/csv',
                           query=[('filter', {'type': ['Computer']})])
     head = 'DHID;Hid;Document-Name;Action-Type;Action-User-LastOwner-Supplier;Action-User-LastOwner-Receiver;Action-Create-By;Trade-Confirmed;Status-Supplier;Status-Receiver;Status Supplier – Created Date;Status Receiver – Created Date;Trade-Weight;Action-Create;Allocate-Start;Allocate-User-Code;Allocate-NumUsers;UsageTimeAllocate;Type;LiveCreate;UsageTimeHdd\n'
-    body = '93652;desktop-lenovo-9644w8n-0169622-00:1a:6b:5e:7f:10;;Status;;foo@foo.com;Receiver;;;Use;;'
+    body = 'O48N2;desktop-lenovo-9644w8n-0169622-00:1a:6b:5e:7f:10;;Status;;foo@foo.com;Receiver;;;Use;;'
     assert head in csv_str
     assert body in csv_str
 
@@ -176,7 +176,7 @@ def test_complet_metrics_with_trade(user: UserClient, user2: UserClient):
                           accept='text/csv',
                           query=[('filter', {'type': ['Computer']})])
 
-    body1_lenovo = '93652;desktop-lenovo-9644w8n-0169622-00:1a:6b:5e:7f:10;;Trade;foo@foo.com;foo2@foo.com;Supplier;False;Refurbish;Use;'
+    body1_lenovo = 'O48N2;desktop-lenovo-9644w8n-0169622-00:1a:6b:5e:7f:10;;Trade;foo@foo.com;foo2@foo.com;Supplier;False;Refurbish;Use;'
     body2_lenovo = ';;0;0;Trade;0;0\n'
 
     body1_acer = 'J2MA2;laptop-acer-aohappy-lusea0d010038879a01601-00:26:c7:8e:cb:8c;;Trade;foo@foo.com;foo2@foo.com;Supplier;False;;Use;;;0;'

tests/test_snapshot.py

@@ -37,7 +37,7 @@ from tests import conftest
 
 @pytest.mark.mvp
 @pytest.mark.usefixtures('auth_app_context')
-# cayop
+    # import pdb; pdb.set_trace()
 def test_snapshot_model():
     """Tests creating a Snapshot with its relationships ensuring correct
     DB mapping.
@@ -318,7 +318,7 @@ def test_snapshot_tag_inner_tag(user: UserClient, tag_id: str, app: Devicehub):
     snapshot_and_check(user, b,
                        action_types=(RateComputer.t, BenchmarkProcessor.t, VisualTest.t))
     with app.app_context():
-        tag = Tag.query.one()  # type: Tag
+        tag = Tag.query.all()[0]  # type: Tag
         assert tag.device_id == 3, 'Tag should be linked to the first device'
 
 
@@ -358,7 +358,7 @@ def test_snapshot_different_properties_same_tags(user: UserClient, tag_id: str):
 def test_snapshot_upload_twice_uuid_error(user: UserClient):
     pc1 = file('basic.snapshot')
     user.post(pc1, res=Snapshot)
-    user.post(pc1, res=Snapshot, status=UniqueViolation)
+    user.post(pc1, res=Snapshot, status=400)
 
 
 @pytest.mark.mvp