diff --git a/tests/unit/admin/views/test_journals.py b/tests/unit/admin/views/test_journals.py index 62f3ac844b3d..72fc7d717e12 100644 --- a/tests/unit/admin/views/test_journals.py +++ b/tests/unit/admin/views/test_journals.py @@ -119,27 +119,3 @@ def test_query_term_version(self, db_request): "journals": [journals[0]], "query": f"version:{journals[0].version}", } - - def test_query_term_ip(self, db_request): - ipv4 = "10.6.6.6" - ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334" - journals0 = sorted( - [JournalEntryFactory.create(submitted_from=ipv4) for _ in range(10)], - key=lambda j: (j.submitted_date, j.id), - reverse=True, - ) - journals1 = sorted( - [JournalEntryFactory.create(submitted_from=ipv6) for _ in range(10)], - key=lambda j: (j.submitted_date, j.id), - reverse=True, - ) - - db_request.GET["q"] = f"ip:{ipv4}" - result = views.journals_list(db_request) - - assert result == {"journals": journals0, "query": f"ip:{ipv4}"} - - db_request.GET["q"] = f"ip:{ipv6}" - result = views.journals_list(db_request) - - assert result == {"journals": journals1, "query": f"ip:{ipv6}"} diff --git a/tests/unit/forklift/test_legacy.py b/tests/unit/forklift/test_legacy.py index fadf31b8445a..6051e18e5acc 100644 --- a/tests/unit/forklift/test_legacy.py +++ b/tests/unit/forklift/test_legacy.py @@ -1472,16 +1472,12 @@ def storage_service_store(path, file_path, *, meta): .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, f"add source file {filename}", user, - db_request.remote_addr, ) ] @@ -2118,26 +2114,11 @@ def test_upload_succeeds_custom_project_size_limit( .order_by("submitted_date", "id") .all() ) - assert [ - (j.name, j.version, j.action, j.submitted_by, j.submitted_from) - for j in journals - ] == [ - ("example", None, "create", user, db_request.remote_addr), - ( - "example", - None, - f"add Owner {user.username}", - user, - db_request.remote_addr, - ), - ("example", "1.0", "new release", user, db_request.remote_addr), - ( - "example", - "1.0", - "add source file example-1.0.tar.gz", - user, - db_request.remote_addr, - ), + assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [ + ("example", None, "create", user), + ("example", None, f"add Owner {user.username}", user), + ("example", "1.0", "new release", user), + ("example", "1.0", "add source file example-1.0.tar.gz", user), ] def test_upload_fails_with_previously_used_filename( @@ -2768,16 +2749,12 @@ def storage_service_store(path, file_path, *, meta): .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, f"add cp34 file {filename}", user, - db_request.remote_addr, ) ] @@ -2902,16 +2879,12 @@ def storage_service_store(path, file_path, *, meta): .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, f"add cp34 file {filename}", user, - db_request.remote_addr, ) ] @@ -3167,23 +3140,18 @@ def test_upload_succeeds_creates_release( .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, ), ] @@ -3464,26 +3432,11 @@ def test_upload_succeeds_creates_project( .order_by("submitted_date", "id") .all() ) - assert [ - (j.name, j.version, j.action, j.submitted_by, j.submitted_from) - for j in journals - ] == [ - ("example", None, "create", user, db_request.remote_addr), - ( - "example", - None, - f"add Owner {user.username}", - user, - db_request.remote_addr, - ), - ("example", "1.0", "new release", user, db_request.remote_addr), - ( - "example", - "1.0", - "add source file example-1.0.tar.gz", - user, - db_request.remote_addr, - ), + assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [ + ("example", None, "create", user), + ("example", None, f"add Owner {user.username}", user), + ("example", "1.0", "new release", user), + ("example", "1.0", "add source file example-1.0.tar.gz", user), ] def test_upload_succeeds_with_signature( diff --git a/tests/unit/manage/test_views.py b/tests/unit/manage/test_views.py index 734ecf537f33..5e0bbed7c7d9 100644 --- a/tests/unit/manage/test_views.py +++ b/tests/unit/manage/test_views.py @@ -3975,7 +3975,6 @@ def test_yank_project_release(self, monkeypatch, db_request): assert entry.action == "yank release" assert entry.version == release.version assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr assert db_request.session.flash.calls == [ pretend.call(f"Yanked release {release.version!r}", queue="success") ] @@ -4129,7 +4128,6 @@ def test_unyank_project_release(self, monkeypatch, db_request): assert entry.action == "unyank release" assert entry.version == release.version assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr assert db_request.session.flash.calls == [ pretend.call(f"Un-yanked release {release.version!r}", queue="success") @@ -4287,7 +4285,6 @@ def test_delete_project_release(self, monkeypatch, db_request): assert entry.action == "remove release" assert entry.version == release.version assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr assert db_request.session.flash.calls == [ pretend.call(f"Deleted release {release.version!r}", queue="success") @@ -4474,7 +4471,6 @@ def test_delete_project_release_file(self, monkeypatch, db_request): version=release.version, action=f"remove file {release_file.filename}", submitted_by=user, - submitted_from=db_request.remote_addr, ) .one() ) @@ -5460,7 +5456,6 @@ def test_change_role(self, db_request, monkeypatch): assert entry.name == project.name assert entry.action == "change Owner testuser to Maintainer" assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr def test_change_role_invalid_role_name(self, pyramid_request): project = pretend.stub(name="foobar") @@ -5578,7 +5573,6 @@ def test_delete_role(self, db_request, monkeypatch): assert entry.name == project.name assert entry.action == "remove Owner testuser" assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr def test_delete_missing_role(self, db_request): project = ProjectFactory.create(name="foobar") @@ -5674,7 +5668,6 @@ def test_delete_not_sole_owner_role(self, db_request, monkeypatch): assert entry.name == project.name assert entry.action == "remove Owner testuser" assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr def test_delete_non_owner_role(self, db_request): project = ProjectFactory.create(name="foobar") diff --git a/tests/unit/manage/views/test_teams.py b/tests/unit/manage/views/test_teams.py index 7ad2ef9ac34f..7cd1cc284811 100644 --- a/tests/unit/manage/views/test_teams.py +++ b/tests/unit/manage/views/test_teams.py @@ -838,7 +838,6 @@ def test_change_role( assert entry.name == organization_project.name assert entry.action == f"change Owner {organization_team.name} to Maintainer" assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr def test_change_role_invalid_role_name(self, pyramid_request, organization_project): pyramid_request.method = "POST" @@ -1023,7 +1022,6 @@ def test_delete_role( assert entry.name == organization_project.name assert entry.action == f"remove Owner {organization_team.name}" assert entry.submitted_by == db_request.user - assert entry.submitted_from == db_request.remote_addr def test_delete_missing_role(self, db_request, organization_project): missing_role_id = str(uuid.uuid4()) diff --git a/tests/unit/utils/test_project.py b/tests/unit/utils/test_project.py index 49f61f9d602e..bac4f71e7fa0 100644 --- a/tests/unit/utils/test_project.py +++ b/tests/unit/utils/test_project.py @@ -140,7 +140,6 @@ def test_remove_project(db_request, flash): ) assert journal_entry.action == "remove project" assert journal_entry.submitted_by == db_request.user - assert journal_entry.submitted_from == db_request.remote_addr @pytest.mark.parametrize("flash", [True, False]) @@ -164,7 +163,6 @@ def test_destroy_docs(db_request, flash): ) assert journal_entry.action == "docdestroy" assert journal_entry.submitted_by == db_request.user - assert journal_entry.submitted_from == db_request.remote_addr assert not ( db_request.db.query(Project) diff --git a/warehouse/accounts/views.py b/warehouse/accounts/views.py index 4196e16a6eb0..2f7db82b372f 100644 --- a/warehouse/accounts/views.py +++ b/warehouse/accounts/views.py @@ -1127,7 +1127,6 @@ def _error(message): name=project.name, action=f"accepted {desired_role} {user.username}", submitted_by=request.user, - submitted_from=request.remote_addr, ) ) project.record_event( diff --git a/warehouse/admin/templates/admin/journals/list.html b/warehouse/admin/templates/admin/journals/list.html index 250603de8f3c..f701ee2e3618 100644 --- a/warehouse/admin/templates/admin/journals/list.html +++ b/warehouse/admin/templates/admin/journals/list.html @@ -26,7 +26,7 @@