File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -727,7 +727,12 @@ def GoogleDriveState_by_drive_id(self):
727727 f"{ self .reconcile_member .netid } " )
728728 member_drive_ids = []
729729 for gds in google_drive_states :
730- if self .reconcile_member .netid == gds .member :
730+ netid_match = netid_regex .match (gds .member )
731+ if not netid_match :
732+ continue
733+
734+ gds_netid = netid_match .group ("netid" )
735+ if self .reconcile_member .netid == gds_netid :
731736 member_drive_ids .append (gds .drive_id )
732737
733738 result = collections .defaultdict (list )
Original file line number Diff line number Diff line change @@ -616,31 +616,31 @@ def setUp(self):
616616 [
617617 GDS (
618618 drive_id = "A" ,
619- member = "Ann " ,
619+ member = "ann@uw.edu " ,
620620 drive_name = "ann's drive" ,
621621 org_unit_name = "100GB" ,
622622 ),
623623 GDS (
624624 drive_id = "B" ,
625- member = "bob" ,
625+ member = "bob@uw.edu " ,
626626 drive_name = "bob's first drive" ,
627627 org_unit_name = "300GB" ,
628628 ),
629629 GDS (
630630 drive_id = "C" ,
631- member = "cam" ,
631+ member = "cam@uw.edu " ,
632632 drive_name = "cam's drive" ,
633633 org_unit_name = "100GB" ,
634634 ),
635635 GDS (
636636 drive_id = "D" ,
637- member = "bob" ,
637+ member = "bob@uw.edu " ,
638638 drive_name = "bob's second drive" ,
639639 org_unit_name = "100GB" ,
640640 ),
641641 GDS (
642642 drive_id = "E" ,
643- member = "bob" ,
643+ member = "bob@washington.edu " ,
644644 drive_name = "bob's third drive" ,
645645 org_unit_name = "100GB" ,
646646 )
You can’t perform that action at this time.
0 commit comments