Refactor and fix flaky tests.

app/database.py

@@ -19,7 +19,11 @@
 class Mixin:
     @classmethod
     def get(cls, id=False, **kwargs):
-        if id is False and not kwargs:
+        if id is None:
+            # NOTE: leaving it to avoid awakinging dragons!
+            return None
+
+        if id is False or id and not kwargs:
             return cls.query.first()
 
         if id:

tests/core.py

@@ -405,12 +405,8 @@ def test_pull_tickets_from_all(_, c):
     assert response.status == '200 OK'
     assert ticket_to_be_pulled is not None
     assert ticket_to_be_pulled.p is False
-    assert Serial.query.filter_by(number=ticket_to_be_pulled.number,
-                                  office_id=ticket_to_be_pulled.office_id,
-                                  task_id=ticket_to_be_pulled.task_id,
-                                  p=True)\
-                       .order_by(Serial.number)\
-                       .first() is not None
+    assert Serial.get(ticket_to_be_pulled.id).number == ticket_to_be_pulled.number
+    assert Serial.get(ticket_to_be_pulled.id).p is True
 
 
 @pytest.mark.parametrize('_', range(TEST_REPEATS))

tests/settings.py

@@ -80,11 +80,12 @@ def test_single_row_pulling(_, c):
                           100)
 
     response = c.get(f'/pull', follow_redirects=True)
+    pulled_ticket = Office.get(0).tickets.order_by(Serial.timestamp.desc()).first()
 
     assert response.status == '200 OK'
     assert Office.get(0).tickets.count() - 1 == tickets_length
-    assert Office.get(0).tickets.first().number - 1 == last_number
-    assert Office.get(0).tickets.first().p is True
+    assert pulled_ticket.number - 1 == last_number
+    assert pulled_ticket.p is True
 
 
 @pytest.mark.usefixtures('c')