From cf2c8d0dbde08a8fa9a7f4531f6eade99cb15b97 Mon Sep 17 00:00:00 2001 From: konstin Date: Wed, 12 Jul 2023 11:05:47 +0200 Subject: [PATCH] changes from main --- tests/unit/forklift/test_legacy.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/unit/forklift/test_legacy.py b/tests/unit/forklift/test_legacy.py index 29d37a2b1ae6..9ba2af6055a7 100644 --- a/tests/unit/forklift/test_legacy.py +++ b/tests/unit/forklift/test_legacy.py @@ -3436,27 +3436,22 @@ def test_upload_succeeds_creates_release_metadata_2_3( # Ensure that all of our journal entries have been created journals = ( db_request.db.query(JournalEntry) - .options(joinedload("submitted_by")) + .options(joinedload(JournalEntry.submitted_by)) .order_by("submitted_date", "id") .all() ) - assert [ - (j.name, j.version, j.action, j.submitted_by, j.submitted_from) - for j in journals - ] == [ + assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [ ( release.project.name, release.version, "new release", user, - db_request.remote_addr, ), ( release.project.name, release.version, f"add source file {filename}", user, - db_request.remote_addr, ), ]