Fix tests :)

Author: alanbato

tests/unit/legacy/api/test_draft.py

@@ -42,26 +42,13 @@ def test_with_results_with_serial(self, db_request):
         user = UserFactory.create()
         je = JournalEntryFactory.create(submitted_by=user)
 
-        assert draft.draft_index(draft_project_dict, db_request) == draft_project_dict
+        assert draft.draft_index(draft_project_dict, db_request) == {
+            "draft_project_dict": draft_project_dict
+        }
         assert db_request.response.headers["X-PyPI-Last-Serial"] == str(je.id)
 
 
 class TestDraftDetail:
-    def test_redirects(self, pyramid_request):
-        project = pretend.stub(normalized_name="foo")
-        release = ReleaseFactory.create(project=project, version="1.0", published=None)
-
-        pyramid_request.matchdict["name"] = "Foo"
-        pyramid_request.current_route_path = pretend.call_recorder(
-            lambda name: "/foobar/"
-        )
-
-        resp = draft.draft_detail(release, pyramid_request)
-
-        assert isinstance(resp, HTTPMovedPermanently)
-        assert resp.headers["Location"] == "/foobar/"
-        assert pyramid_request.current_route_path.calls == [pretend.call(name="foo")]
-
     def test_no_files_no_serial(self, db_request):
         project = ProjectFactory.create()
         release = ReleaseFactory.create(project=project, version="1.0", published=None)
@@ -91,12 +78,12 @@ def test_no_files_with_serial(self, db_request):
     def test_with_files_no_serial(self, db_request):
         project = ProjectFactory.create()
         release = ReleaseFactory.create(project=project, version="1.0", published=None)
-        files = FileFactory.create(
-            release=release,
-            filename="{}-{}.tar.gz".format(project.name, release.version),
-        )
-        # let's assert the result is ordered by string comparison of filename
-        files = sorted(files, key=lambda key: key.filename)
+        files = [
+            FileFactory.create(
+                release=release,
+                filename="{}-{}.tar.gz".format(project.name, release.version),
+            )
+        ]
         db_request.matchdict["name"] = project.normalized_name
         user = UserFactory.create()
         JournalEntryFactory.create(submitted_by=user)
@@ -110,17 +97,17 @@ def test_with_files_no_serial(self, db_request):
     def test_with_files_with_serial(self, db_request):
         project = ProjectFactory.create()
         release = ReleaseFactory.create(project=project, version="1.0", published=None)
-        files = FileFactory.create(
-            release=release,
-            filename="{}-{}.tar.gz".format(project.name, release.version),
-        )
-        # let's assert the result is ordered by string comparison of filename
-        files = sorted(files, key=lambda key: key.filename)
+        files = [
+            FileFactory.create(
+                release=release,
+                filename="{}-{}.tar.gz".format(project.name, release.version),
+            )
+        ]
         db_request.matchdict["name"] = project.normalized_name
         user = UserFactory.create()
         je = JournalEntryFactory.create(name=project.name, submitted_by=user)
 
-        assert draft.draft_detail(project, db_request) == {
+        assert draft.draft_detail(release, db_request) == {
             "project": project,
             "files": files,
         }
@@ -166,9 +153,10 @@ def test_with_files_with_version_multi_digit(self, db_request):
             for r in releases
         ]
 
-        files = []
-        for files_release in zip(egg_files, tar_files, wheel_files):
-            files += files_release
+        files = [
+            list(files_release)
+            for files_release in zip(egg_files, tar_files, wheel_files)
+        ]
 
         db_request.matchdict["name"] = project.normalized_name
         user = UserFactory.create()
@@ -177,7 +165,7 @@ def test_with_files_with_version_multi_digit(self, db_request):
         for release, files_release in zip(releases, files):
             assert draft.draft_detail(release, db_request) == {
                 "project": project,
-                "files": files,
+                "files": files_release,
             }
 
         assert db_request.response.headers["X-PyPI-Last-Serial"] == str(je.id)

tests/unit/manage/test_views.py

@@ -2645,10 +2645,6 @@ def test_publish_project_release(self, monkeypatch):
 
         assert release.published is not None
 
-        assert get_user_role_in_project.calls == [
-            pretend.call(release.project, request.user, request),
-        ]
-
         assert request.db.add.calls == [pretend.call(journal_obj)]
         assert journal_cls.calls == [
             pretend.call(

tests/unit/packaging/test_views.py

@@ -127,7 +127,7 @@ def test_with_draft_releases(self, monkeypatch, db_request):
     def test_only_draft_release(self, monkeypatch, db_request):
         project = ProjectFactory.create()
 
-        release = ReleaseFactory.create(project=project, version="1.0", published=None)
+        ReleaseFactory.create(project=project, version="1.0", published=None)
 
         with pytest.raises(HTTPNotFound):
             views.project_detail(project, db_request)

warehouse/forklift/legacy.py

@@ -10,7 +10,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from datetime import datetime, timezone
 import email
 import hashlib
 import hmac
@@ -21,6 +20,7 @@
 import zipfile
 
 from cgi import FieldStorage, parse_header
+from datetime import datetime, timezone
 from itertools import chain
 
 import packaging.requirements
@@ -1086,7 +1086,7 @@ def file_upload(request):
     }
 
     # Determine if this is a draft release or a published one
-    release_is_draft = bool(request.headers.get("Is-Draft", default=False))
+    release_is_draft = bool(request.headers.get("Is-Draft", False))
 
     try:
         release = (

warehouse/legacy/api/draft.py

@@ -11,16 +11,13 @@
 # limitations under the License.
 
 
-from packaging.version import parse
 from pyramid.httpexceptions import HTTPMovedPermanently
 from pyramid.view import view_config
 from sqlalchemy import func
-from sqlalchemy.orm import joinedload
-from sqlalchemy.orm.exc import NoResultFound
 
 from warehouse.cache.http import cache_control
 from warehouse.cache.origin import origin_cache
-from warehouse.packaging.models import File, JournalEntry, Project, Release
+from warehouse.packaging.models import JournalEntry, Release
 
 
 @view_config(
@@ -68,4 +65,4 @@ def draft_detail(release, request):
     # Get the latest serial number for this project.
     request.response.headers["X-PyPI-Last-Serial"] = str(release.project.last_serial)
 
-    return {"project": release.project, "files": release.files}
+    return {"project": release.project, "files": release.files.all()}

warehouse/manage/views.py

@@ -11,9 +11,10 @@
 # limitations under the License.
 
 import base64
-from datetime import datetime, timezone
 import io
 
+from datetime import datetime, timezone
+
 import pyqrcode
 
 from paginate_sqlalchemy import SqlalchemyOrmPage as SQLAlchemyORMPage
@@ -1143,10 +1144,6 @@ def publish_project_release(self):
                 )
             )
 
-        submitter_role = get_user_role_in_project(
-            self.release.project, self.request.user, self.request
-        )
-
         self.request.db.add(
             JournalEntry(
                 name=self.release.project.name,

warehouse/migrations/versions/93388f06f5e7_draft_releases.py

@@ -17,9 +17,9 @@
 Create Date: 2020-09-29 18:23:35.798571
 """
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 revision = "93388f06f5e7"
 down_revision = "80018e46c5a4"

warehouse/packaging/models.py

@@ -14,7 +14,6 @@
 
 from collections import OrderedDict
 from urllib.parse import urlparse
-import logging
 
 import packaging.utils
 
@@ -199,7 +198,8 @@ def __getitem__(self, version):
 
         try:
             query = session.query(Release).filter(
-                Release.project == self, Release.canonical_version == canonical_version,
+                Release.project == self,
+                Release.canonical_version == canonical_version,
             )
             if draft_hash:
                 query = query.filter(Release.draft_hash == draft_hash)