Commit 0c100736 authored by Jeremy Pallats's avatar Jeremy Pallats 💬
Browse files

Fix two tests.

parent 0a730217

cogdb/schema.py

+1 −1
Original line number Diff line number Diff line
@@ -1737,7 +1737,7 @@ def empty_tables(session, *, perm=False): 
    classes = [FortDrop, UMHold, FortSystem, UMSystem, FortUser, UMUser, KOS,

               KOS, TrackSystem, TrackSystemCached, TrackByID,

               AdminPerm, ChannelPerm, RolePerm,

               OCRTracker, OCRTrigger, OCRPrep, Global]

               OCRTracker, OCRTrigger, OCRPrep]

    if perm:

        classes += [DiscordUser]

tests/cogdb/test_query.py

+2 −0
Original line number Diff line number Diff line
@@ -873,6 +873,8 @@ def test_ocr_update_forts(session, db_cleanup): 
    expect = [{'range': 'G6:G7', 'values': [[5555], [2500]]}, {'range': 'H6:H7', 'values': [[5422], [1000]]}, {'range': 'J6:J7', 'values': [[4444], [2250]]}]

    assert cell_updates == expect



    session.close()





def test_ocr_prep_report(session, f_ocr_testbed, f_global_testbed):

    prep = f_ocr_testbed[2][0]

tests/cogdb/test_scanners.py

+2 −2
Original line number Diff line number Diff line
@@ -443,14 +443,14 @@ async def test_kosscanner_kos_entries(f_asheet_kos): 


@pytest.mark.asyncio

async def test_kosscanner_parse_sheet(f_asheet_kos, session, db_cleanup):

    fscan = KOSScanner(f_asheet_kos)



    assert not session.query(KOS).all()



    fscan = KOSScanner(f_asheet_kos)

    await fscan.update_cells()

    fscan.parse_sheet(session)



    assert session.query(KOS).all()

    session.close()





@pytest.mark.asyncio

tests/conftest.py

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ def db_cleanup(): 


        classes = [DiscordUser, FortUser, FortSystem, FortDrop, FortOrder, UMUser, UMSystem, UMHold,

                KOS, TrackSystem, TrackSystemCached, TrackByID, AdminPerm, ChannelPerm, RolePerm,

                OCRTracker, OCRTrigger, OCRPrep, Global]

                OCRTracker, OCRTrigger, OCRPrep]

        for cls in classes:

            assert session.query(cls).all() == []