Skip to content

Commit 7395302

Browse files
committed
updated tests
1 parent 3324579 commit 7395302

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

tests/common/db/packaging.py

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class Meta:
7575

7676
uploader = factory.SubFactory(UserFactory)
7777
description = factory.SubFactory(DescriptionFactory)
78+
files = []
7879

7980

8081
class FileFactory(WarehouseFactory):

tests/unit/search/test_tasks.py

+19-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
unindex_project,
3232
)
3333

34-
from ...common.db.packaging import ProjectFactory, ReleaseFactory
34+
from ...common.db.packaging import FileFactory, ProjectFactory, ReleaseFactory
3535

3636

3737
def test_project_docs(db_session):
@@ -45,6 +45,15 @@ def test_project_docs(db_session):
4545
for p in projects
4646
}
4747

48+
for p in projects:
49+
for r in releases[p]:
50+
f = FileFactory.create(
51+
release=r,
52+
filename="{}-{}.tar.gz".format(p.name, r.version),
53+
python_version="source",
54+
)
55+
r.files.append(f)
56+
4857
assert list(_project_docs(db_session)) == [
4958
{
5059
"_id": p.normalized_name,
@@ -75,6 +84,15 @@ def test_single_project_doc(db_session):
7584
for p in projects
7685
}
7786

87+
for p in projects:
88+
for r in releases[p]:
89+
f = FileFactory.create(
90+
release=r,
91+
filename="{}-{}.tar.gz".format(p.name, r.version),
92+
python_version="source",
93+
)
94+
r.files.append(f)
95+
7896
assert list(_project_docs(db_session, project_name=projects[1].name)) == [
7997
{
8098
"_id": p.normalized_name,

warehouse/search/tasks.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,15 @@
3737
from warehouse.utils.db import windowed_query
3838

3939

40-
def _project_docs(db, project_name=None):
40+
def _project_docs(db, project_name=None, show_empty_releases=False):
41+
42+
queries = [Release.yanked.is_(False)]
43+
if not show_empty_releases:
44+
queries.append(Release.files)
4145

4246
releases_list = (
4347
db.query(Release.id)
44-
.filter(Release.yanked.is_(False), Release.files)
48+
.filter(*queries)
4549
.order_by(
4650
Release.project_id,
4751
Release.is_prerelease.nullslast(),

0 commit comments

Comments
 (0)