diff --git a/tests/unit/sponsors/test_init.py b/tests/unit/sponsors/test_init.py index 582a25ea890c..30cbccc7e623 100644 --- a/tests/unit/sponsors/test_init.py +++ b/tests/unit/sponsors/test_init.py @@ -3,10 +3,8 @@ import pretend from celery.schedules import crontab -from sqlalchemy import true from warehouse import sponsors -from warehouse.sponsors.models import Sponsor from warehouse.sponsors.tasks import update_pypi_sponsors from ...common.db.sponsors import SponsorFactory @@ -47,11 +45,10 @@ def test_do_not_schedule_sponsor_api_integration_if_no_token(): def test_list_sponsors(db_request): - SponsorFactory.create_batch(5) + expected = SponsorFactory.create_batch(5) SponsorFactory.create_batch(3, is_active=False) result = sponsors._sponsors(db_request) - expected = db_request.db.query(Sponsor).filter(Sponsor.is_active == true()).all() - assert result == expected assert len(result) == 5 + assert set(result) == set(expected) diff --git a/warehouse/sponsors/__init__.py b/warehouse/sponsors/__init__.py index 1fe5f8e62d33..e8e8e756fdaa 100644 --- a/warehouse/sponsors/__init__.py +++ b/warehouse/sponsors/__init__.py @@ -8,7 +8,12 @@ def _sponsors(request): - return request.db.query(Sponsor).filter(Sponsor.is_active == true()).all() + return ( + request.db.query(Sponsor) + .filter(Sponsor.is_active == true()) + .order_by(Sponsor.level_order, Sponsor.name) + .all() + ) def includeme(config): diff --git a/warehouse/templates/pages/sponsors.html b/warehouse/templates/pages/sponsors.html index 90821deaa3ce..8510593ee7b3 100644 --- a/warehouse/templates/pages/sponsors.html +++ b/warehouse/templates/pages/sponsors.html @@ -164,7 +164,7 @@

Infrastructure sponsors