Skip to content

Commit 51bd808

Browse files
committed
Clean up test fixtures
1 parent f014f3e commit 51bd808

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

citadel/indico_citadel/schemas_test.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
from indico.modules.events.notes.models.notes import EventNote, RenderMode
2222

2323

24-
pytest_plugins = 'indico.modules.events.timetable.testing.fixtures'
25-
26-
2724
def test_dump_event(db, dummy_user, dummy_event):
2825
from .schemas import EventRecordSchema
2926

@@ -67,7 +64,7 @@ def test_dump_event(db, dummy_user, dummy_event):
6764

6865

6966
@pytest.mark.parametrize('scheduled', (False, True))
70-
def test_dump_contribution(db, dummy_user, dummy_event, dummy_contribution, create_entry, scheduled):
67+
def test_dump_contribution(db, dummy_user, dummy_event, dummy_contribution, create_timetable_entry, scheduled):
7168
from .schemas import ContributionRecordSchema
7269

7370
person = EventPerson.create_from_user(dummy_user, dummy_event)
@@ -76,7 +73,7 @@ def test_dump_contribution(db, dummy_user, dummy_event, dummy_contribution, crea
7673

7774
extra = {}
7875
if scheduled:
79-
create_entry(dummy_contribution, utc.localize(datetime(2020, 4, 20, 4, 20)))
76+
create_timetable_entry(dummy_event, dummy_contribution, utc.localize(datetime(2020, 4, 20, 4, 20)))
8077
extra = {
8178
'start_dt': dummy_contribution.start_dt.isoformat(),
8279
'end_dt': dummy_contribution.end_dt.isoformat(),
@@ -114,12 +111,12 @@ def test_dump_contribution(db, dummy_user, dummy_event, dummy_contribution, crea
114111

115112

116113
@pytest.mark.parametrize('scheduled', (False, True))
117-
def test_dump_subcontribution(db, dummy_user, dummy_event, dummy_contribution, create_entry, scheduled):
114+
def test_dump_subcontribution(db, dummy_user, dummy_event, dummy_contribution, create_timetable_entry, scheduled):
118115
from .schemas import SubContributionRecordSchema
119116

120117
extra = {}
121118
if scheduled:
122-
create_entry(dummy_contribution, utc.localize(datetime(2020, 4, 20, 4, 20)))
119+
create_timetable_entry(dummy_event, dummy_contribution, utc.localize(datetime(2020, 4, 20, 4, 20)))
123120
extra = {
124121
'start_dt': dummy_contribution.start_dt.isoformat(),
125122
'end_dt': dummy_contribution.end_dt.isoformat(),

0 commit comments

Comments
 (0)