Skip to content

Commit 94053ef

Browse files
ThiefMasterThiefMaster
committed
ZoomRooms: Fix tests (numeric zoom IDs)
1 parent d1fae4a commit 94053ef

1 file changed

Lines changed: 33 additions & 33 deletions

File tree

‎zoom_rooms/indico_zoom_rooms/plugin_test.py‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def zr_session(zr_event, zr_powered_room, app_context, dummy_room, create_zoom_m
198198
)
199199

200200

201-
EVENT_ENTRY_ID = 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting1'
201+
EVENT_ENTRY_ID = 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100000'
202202
ENTRY_TITLE = 'Zoom Meeting'
203203

204204

@@ -312,7 +312,7 @@ def test_contrib(mock_tasks, dummy_room, zr_event, zr_contrib, zr_powered_room,
312312
}
313313
assert _entry_data(next(tasks)) == {
314314
'type': ZoomRoomsAction.create,
315-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
315+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
316316
'entry_data': {
317317
'title': ENTRY_TITLE,
318318
'start_dt': datetime(2024, 3, 1, 16, 15, tzinfo=TZ).timestamp(),
@@ -335,7 +335,7 @@ def test_contrib(mock_tasks, dummy_room, zr_event, zr_contrib, zr_powered_room,
335335

336336
assert _entry_data(next(tasks)) == {
337337
'type': ZoomRoomsAction.delete,
338-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
338+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
339339
'entry_data': None,
340340
'zoom_room_id': 'test-zoom-room-1@example.com',
341341
'extra_args': None,
@@ -360,7 +360,7 @@ def test_contrib(mock_tasks, dummy_room, zr_event, zr_contrib, zr_powered_room,
360360
tasks = mock_tasks()
361361
assert _entry_data(next(tasks)) == {
362362
'type': ZoomRoomsAction.create,
363-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
363+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
364364
'entry_data': {
365365
'title': ENTRY_TITLE,
366366
'start_dt': datetime(2024, 3, 1, 17, 15, tzinfo=TZ).timestamp(),
@@ -379,7 +379,7 @@ def test_contrib(mock_tasks, dummy_room, zr_event, zr_contrib, zr_powered_room,
379379
tasks = mock_tasks()
380380
assert _entry_data(next(tasks)) == {
381381
'type': ZoomRoomsAction.update,
382-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
382+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
383383
'entry_data': {
384384
'title': ENTRY_TITLE,
385385
'start_dt': datetime(2024, 3, 1, 16, 25, tzinfo=TZ).timestamp(),
@@ -407,7 +407,7 @@ def test_contrib(mock_tasks, dummy_room, zr_event, zr_contrib, zr_powered_room,
407407
tasks = mock_tasks()
408408
assert _entry_data(next(tasks)) == {
409409
'type': ZoomRoomsAction.move,
410-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
410+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
411411
'entry_data': {
412412
'title': ENTRY_TITLE,
413413
'start_dt': datetime(2024, 3, 1, 16, 25, tzinfo=TZ).timestamp(),
@@ -425,14 +425,14 @@ def test_contrib(mock_tasks, dummy_room, zr_event, zr_contrib, zr_powered_room,
425425
tasks = mock_tasks()
426426
assert _entry_data(next(tasks)) == {
427427
'type': ZoomRoomsAction.delete,
428-
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:contribution:1:zmeeting2',
428+
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:contribution:1:100001',
429429
'entry_data': None,
430430
'zoom_room_id': 'test-zoom-room-2@example.com',
431431
'extra_args': None,
432432
}
433433
assert _entry_data(next(tasks)) == {
434434
'type': ZoomRoomsAction.create,
435-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting2',
435+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100001',
436436
'entry_data': {
437437
'title': ENTRY_TITLE,
438438
'start_dt': datetime(2024, 3, 1, 16, 00, tzinfo=TZ).timestamp(),
@@ -458,7 +458,7 @@ def test_contrib(mock_tasks, dummy_room, zr_event, zr_contrib, zr_powered_room,
458458
}
459459
assert _entry_data(next(tasks)) == {
460460
'type': ZoomRoomsAction.delete,
461-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting2',
461+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100001',
462462
'entry_data': None,
463463
'zoom_room_id': 'test-zoom-room-1@example.com',
464464
'extra_args': None,
@@ -486,7 +486,7 @@ def test_session_block(zr_event, mock_tasks, zr_session, zr_powered_room, anothe
486486
}
487487
assert _entry_data(next(tasks)) == {
488488
'type': ZoomRoomsAction.create,
489-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
489+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
490490
'entry_data': {
491491
'title': ENTRY_TITLE,
492492
'start_dt': datetime(2024, 3, 1, 16, 15, tzinfo=TZ).timestamp(),
@@ -498,7 +498,7 @@ def test_session_block(zr_event, mock_tasks, zr_session, zr_powered_room, anothe
498498
}
499499
assert _entry_data(next(tasks)) == {
500500
'type': ZoomRoomsAction.create,
501-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:block:1:zmeeting4',
501+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:block:1:100003',
502502
'entry_data': {
503503
'title': ENTRY_TITLE,
504504
'start_dt': datetime(2024, 3, 1, 16, 15, tzinfo=TZ).timestamp(),
@@ -528,7 +528,7 @@ def test_session_block(zr_event, mock_tasks, zr_session, zr_powered_room, anothe
528528
tasks = mock_tasks()
529529
assert _entry_data(next(tasks)) == {
530530
'type': ZoomRoomsAction.create,
531-
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:block:2:zmeeting5',
531+
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:block:2:100004',
532532
'entry_data': {
533533
'title': ENTRY_TITLE,
534534
'start_dt': datetime(2024, 3, 1, 17, 15, tzinfo=TZ).timestamp(),
@@ -540,7 +540,7 @@ def test_session_block(zr_event, mock_tasks, zr_session, zr_powered_room, anothe
540540
}
541541
assert _entry_data(next(tasks)) == {
542542
'type': ZoomRoomsAction.create,
543-
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:contribution:2:zmeeting3',
543+
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:contribution:2:100002',
544544
'entry_data': {
545545
'title': ENTRY_TITLE,
546546
'start_dt': datetime(2024, 3, 1, 17, 15, tzinfo=TZ).timestamp(),
@@ -559,7 +559,7 @@ def test_session_block(zr_event, mock_tasks, zr_session, zr_powered_room, anothe
559559
tasks = mock_tasks()
560560
assert _entry_data(next(tasks)) == {
561561
'type': ZoomRoomsAction.move,
562-
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:contribution:2:zmeeting3',
562+
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:contribution:2:100002',
563563
'entry_data': {
564564
'title': ENTRY_TITLE,
565565
'start_dt': datetime(2024, 3, 1, 17, 15, tzinfo=TZ).timestamp(),
@@ -592,56 +592,56 @@ def test_session_block(zr_event, mock_tasks, zr_session, zr_powered_room, anothe
592592

593593
assert _entry_data(next(tasks)) == {
594594
'type': ZoomRoomsAction.delete,
595-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:block:1:zmeeting4',
595+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:block:1:100003',
596596
'entry_data': None,
597597
'zoom_room_id': 'test-zoom-room-1@example.com',
598598
'extra_args': None,
599599
}
600600
assert _entry_data(next(tasks)) == {
601601
'type': ZoomRoomsAction.create,
602-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting4',
602+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100003',
603603
'entry_data': entry_data,
604604
'zoom_room_id': 'test-zoom-room-1@example.com',
605605
'extra_args': None,
606606
}
607607
assert _entry_data(next(tasks)) == {
608608
'type': ZoomRoomsAction.delete,
609-
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:block:2:zmeeting5',
609+
'entry_id': 'zoom_meeting:test-zoom-room-2@example.com@indico:event:1:block:2:100004',
610610
'entry_data': None,
611611
'zoom_room_id': 'test-zoom-room-2@example.com',
612612
'extra_args': None,
613613
}
614614
assert _entry_data(next(tasks)) == {
615615
'type': ZoomRoomsAction.create,
616-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting5',
616+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100004',
617617
'entry_data': entry_data,
618618
'zoom_room_id': 'test-zoom-room-1@example.com',
619619
'extra_args': None,
620620
}
621621
assert _entry_data(next(tasks)) == {
622622
'type': ZoomRoomsAction.delete,
623-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
623+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
624624
'entry_data': None,
625625
'zoom_room_id': 'test-zoom-room-1@example.com',
626626
'extra_args': None,
627627
}
628628
assert _entry_data(next(tasks)) == {
629629
'type': ZoomRoomsAction.create,
630-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting2',
630+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100001',
631631
'entry_data': entry_data,
632632
'zoom_room_id': 'test-zoom-room-1@example.com',
633633
'extra_args': None,
634634
}
635635
assert _entry_data(next(tasks)) == {
636636
'type': ZoomRoomsAction.delete,
637-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:2:zmeeting3',
637+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:2:100002',
638638
'entry_data': None,
639639
'zoom_room_id': 'test-zoom-room-1@example.com',
640640
'extra_args': None,
641641
}
642642
assert _entry_data(next(tasks)) == {
643643
'type': ZoomRoomsAction.create,
644-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting3',
644+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100002',
645645
'entry_data': entry_data,
646646
'zoom_room_id': 'test-zoom-room-1@example.com',
647647
'extra_args': None,
@@ -662,7 +662,7 @@ def test_move_between_blocks(mock_tasks, zr_session):
662662
tasks = mock_tasks()
663663
assert _entry_data(next(tasks)) == {
664664
'type': ZoomRoomsAction.delete,
665-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
665+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
666666
'entry_data': None,
667667
'zoom_room_id': 'test-zoom-room-1@example.com',
668668
'extra_args': None,
@@ -675,7 +675,7 @@ def test_move_between_blocks(mock_tasks, zr_session):
675675
tasks = mock_tasks()
676676
assert _entry_data(next(tasks)) == {
677677
'type': ZoomRoomsAction.create,
678-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
678+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
679679
'entry_data': {
680680
'title': ENTRY_TITLE,
681681
'start_dt': datetime(2024, 3, 1, 16, 15, tzinfo=TZ).timestamp(),
@@ -701,7 +701,7 @@ def test_clone(zr_event, mock_tasks, zr_session, db_reset_seqs):
701701
# only block_1 is in an ZR-ready room, so the clone of block_2 shouldn't be mentioned at all
702702
assert _entry_data(next(tasks)) == {
703703
'type': ZoomRoomsAction.create,
704-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:2:zmeeting1',
704+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:2:100000',
705705
'entry_data': {
706706
'title': 'New Room',
707707
'start_dt': datetime(2024, 4, 1, 9, 30, tzinfo=TZ).timestamp(),
@@ -713,7 +713,7 @@ def test_clone(zr_event, mock_tasks, zr_session, db_reset_seqs):
713713
}
714714
assert _entry_data(next(tasks)) == {
715715
'type': ZoomRoomsAction.create,
716-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:2:contribution:3:zmeeting2',
716+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:2:contribution:3:100001',
717717
'entry_data': {
718718
'title': 'New Room',
719719
'start_dt': datetime(2024, 4, 1, 9, 45, tzinfo=TZ).timestamp(),
@@ -725,7 +725,7 @@ def test_clone(zr_event, mock_tasks, zr_session, db_reset_seqs):
725725
}
726726
assert _entry_data(next(tasks)) == {
727727
'type': ZoomRoomsAction.create,
728-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:2:block:4:zmeeting4',
728+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:2:block:4:100003',
729729
'entry_data': {
730730
'title': 'New Room',
731731
'start_dt': datetime(2024, 4, 1, 9, 45, tzinfo=TZ).timestamp(),
@@ -763,14 +763,14 @@ def test_reassign(zr_event, zr_contrib, mock_tasks, test_client, no_csrf_check,
763763
tasks = mock_tasks()
764764
assert _entry_data(next(tasks)) == {
765765
'type': ZoomRoomsAction.delete,
766-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
766+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
767767
'entry_data': None,
768768
'zoom_room_id': 'test-zoom-room-1@example.com',
769769
'extra_args': None,
770770
}
771771
assert _entry_data(next(tasks)) == {
772772
'type': ZoomRoomsAction.create,
773-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting2',
773+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100001',
774774
'entry_data': {
775775
'title': ENTRY_TITLE,
776776
'start_dt': datetime(2024, 3, 1, 16, 00, tzinfo=TZ).timestamp(),
@@ -805,7 +805,7 @@ def test_zoom_meeting_rename(zr_event, mock_tasks, test_client, no_csrf_check, z
805805
tasks = mock_tasks()
806806
assert _entry_data(next(tasks)) == {
807807
'type': ZoomRoomsAction.update,
808-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting1',
808+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100000',
809809
'entry_data': {
810810
'title': 'New name for meeting',
811811
'start_dt': datetime(2024, 3, 1, 16, 00, tzinfo=TZ).timestamp(),
@@ -827,7 +827,7 @@ def test_corner_case_update_no_room(zr_event, mock_tasks):
827827
tasks = mock_tasks()
828828
assert _entry_data(next(tasks)) == {
829829
'type': ZoomRoomsAction.delete,
830-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting1',
830+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100000',
831831
'entry_data': None,
832832
'zoom_room_id': 'test-zoom-room-1@example.com',
833833
'extra_args': None,
@@ -862,7 +862,7 @@ def test_corner_case_timetable_expand(zr_contrib, mock_tasks, dummy_user, db):
862862
tasks = mock_tasks()
863863
assert _entry_data(next(tasks)) == {
864864
'type': ZoomRoomsAction.update,
865-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:zmeeting2',
865+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:contribution:1:100001',
866866
'entry_data': {
867867
'title': ENTRY_TITLE,
868868
'start_dt': datetime(2024, 3, 1, 16, 15, tzinfo=TZ).timestamp(),
@@ -875,7 +875,7 @@ def test_corner_case_timetable_expand(zr_contrib, mock_tasks, dummy_user, db):
875875

876876
assert _entry_data(next(tasks)) == {
877877
'type': ZoomRoomsAction.update,
878-
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:zmeeting1',
878+
'entry_id': 'zoom_meeting:test-zoom-room-1@example.com@indico:event:1:100000',
879879
'entry_data': {
880880
'title': ENTRY_TITLE,
881881
'start_dt': datetime(2024, 3, 1, 16, 00, tzinfo=TZ).timestamp(),

0 commit comments

Comments
 (0)