From 10a720a9edc9859f2606b2d6ee44e408c1393cfd Mon Sep 17 00:00:00 2001 From: Bruno Carrez Date: Thu, 29 Feb 2024 22:32:19 -0500 Subject: [PATCH] fix test_query_to_ldap_server_and_writing_to_output_json (ignore co_supervisor too, there was no case with co_supervisor before exceptions handling was implemented, so the test had to be updated) --- tests/functional/ldap/test_functional_revision.py | 3 --- tests/functional/ldap/test_read_mila_ldap.py | 1 + tests/unittests/ldap/test_backfill.py | 1 - tests/unittests/ldap/test_revision.py | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/functional/ldap/test_functional_revision.py b/tests/functional/ldap/test_functional_revision.py index ac44a808..26207471 100644 --- a/tests/functional/ldap/test_functional_revision.py +++ b/tests/functional/ldap/test_functional_revision.py @@ -74,7 +74,6 @@ def user_with_history(username): @pytest.mark.usefixtures("write_setup") def test_get_user_fetch_latest(): - user_with_history("user1") # @@ -140,7 +139,6 @@ def test_update_status_nodb_snapshots(status): @pytest.mark.usefixtures("write_setup") @pytest.mark.parametrize("status", statuses) def test_update_status_db_nosnapshots(status): - collection = users_collection().get_collection() update_user(collection, make_user(status)) users = user_dict([]) @@ -171,7 +169,6 @@ def test_update_status_db_nosnapshots(status): @pytest.mark.usefixtures("write_setup") @pytest.mark.parametrize("start,end", transitions()) def test_update_status_users_exists_on_both(start, end): - collection = users_collection().get_collection() update_user(collection, make_user(start, record_start=datetime(2000, 1, 1))) documents_before = list(collection.find({})) diff --git a/tests/functional/ldap/test_read_mila_ldap.py b/tests/functional/ldap/test_read_mila_ldap.py index b4b03c1e..a8761212 100644 --- a/tests/functional/ldap/test_read_mila_ldap.py +++ b/tests/functional/ldap/test_read_mila_ldap.py @@ -45,6 +45,7 @@ def mock_query_ldap( # resolve_supervisors is not called here e["supervisor"] = None + e["co_supervisor"] = None assert e == processed_user diff --git a/tests/unittests/ldap/test_backfill.py b/tests/unittests/ldap/test_backfill.py index d764c5bd..f6fb1853 100644 --- a/tests/unittests/ldap/test_backfill.py +++ b/tests/unittests/ldap/test_backfill.py @@ -32,7 +32,6 @@ def userhistory(email, history): latest_record = base_user for start, fields in history: - if prev_fields is not None: prev_fields["End Date with MILA"] = start latest_record = dictset(latest_record, prev_fields) diff --git a/tests/unittests/ldap/test_revision.py b/tests/unittests/ldap/test_revision.py index 0f95f2c1..5ee53365 100644 --- a/tests/unittests/ldap/test_revision.py +++ b/tests/unittests/ldap/test_revision.py @@ -139,7 +139,6 @@ def test_ldap_update_status_db_noldap(status): @pytest.mark.parametrize("start,end", transitions()) def test_ldap_update_status_users_exists_on_both(start, end): - collection = MockCollection( [STANDARD_USER, make_user(start, record_start=datetime(2000, 1, 1))] )