Fix tests by using .zip content for a .whl

Tests were failing, because wheel upload test used .tar.gz
content, and zipfile could not open that content to extract
METADATA (which was also absent).

The fix adds two helpers to avoid repeated code.

Author: abitrolly

tests/unit/forklift/test_legacy.py

@@ -67,19 +67,26 @@ def _get_tar_testdata(compression_type=""):
     return temp_f.getvalue()
 
 
+def _get_whl_testdata(name="fake_package", version="1.0"):
+    temp_f = io.BytesIO()
+    with zipfile.ZipFile(file=temp_f, mode="w") as zfp:
+        zfp.writestr(f"{name}-{version}.dist-info/METADATA", "Fake metadata")
+    return temp_f.getvalue()
+
+
+def _storage_hash(data):
+    return hashlib.blake2b(data, digest_size=256 // 8).hexdigest()
+
+
 _TAR_GZ_PKG_TESTDATA = _get_tar_testdata("gz")
 _TAR_GZ_PKG_MD5 = hashlib.md5(_TAR_GZ_PKG_TESTDATA).hexdigest()
 _TAR_GZ_PKG_SHA256 = hashlib.sha256(_TAR_GZ_PKG_TESTDATA).hexdigest()
-_TAR_GZ_PKG_STORAGE_HASH = hashlib.blake2b(
-    _TAR_GZ_PKG_TESTDATA, digest_size=256 // 8
-).hexdigest()
+_TAR_GZ_PKG_STORAGE_HASH = _storage_hash(_TAR_GZ_PKG_TESTDATA)
 
 _TAR_BZ2_PKG_TESTDATA = _get_tar_testdata("bz2")
 _TAR_BZ2_PKG_MD5 = hashlib.md5(_TAR_BZ2_PKG_TESTDATA).hexdigest()
 _TAR_BZ2_PKG_SHA256 = hashlib.sha256(_TAR_BZ2_PKG_TESTDATA).hexdigest()
-_TAR_BZ2_PKG_STORAGE_HASH = hashlib.blake2b(
-    _TAR_BZ2_PKG_TESTDATA, digest_size=256 // 8
-).hexdigest()
+_TAR_BZ2_PKG_STORAGE_HASH = _storage_hash(_TAR_BZ2_PKG_TESTDATA)
 
 
 class TestExcWithMessage:
@@ -2599,6 +2606,8 @@ def test_upload_succeeds_with_wheel(
         RoleFactory.create(user=user, project=project)
 
         filename = "{}-{}-cp34-none-{}.whl".format(project.name, release.version, plat)
+        filebody = _get_whl_testdata(project.name)
+        file_storage_hash = _storage_hash(filebody)
 
         db_request.user = user
         db_request.user_agent = "warehouse-tests/6.6.6"
@@ -2609,10 +2618,10 @@ def test_upload_succeeds_with_wheel(
                 "version": release.version,
                 "filetype": "bdist_wheel",
                 "pyversion": "cp34",
-                "md5_digest": _TAR_GZ_PKG_MD5,
+                "md5_digest": hashlib.md5(filebody).hexdigest(),
                 "content": pretend.stub(
                     filename=filename,
-                    file=io.BytesIO(_TAR_GZ_PKG_TESTDATA),
+                    file=io.BytesIO(filebody),
                     type="application/tar",
                 ),
             }
@@ -2621,7 +2630,10 @@ def test_upload_succeeds_with_wheel(
         @pretend.call_recorder
         def storage_service_store(path, file_path, *, meta):
             with open(file_path, "rb") as fp:
-                assert fp.read() == _TAR_GZ_PKG_TESTDATA
+                if file_path.endswith(".metadata"):
+                    assert fp.read() == b"Fake metadata"
+                else:
+                    assert fp.read() == filebody
 
         storage_service = pretend.stub(store=storage_service_store)
 
@@ -2645,9 +2657,9 @@ def storage_service_store(path, file_path, *, meta):
             pretend.call(
                 "/".join(
                     [
-                        _TAR_GZ_PKG_STORAGE_HASH[:2],
-                        _TAR_GZ_PKG_STORAGE_HASH[2:4],
-                        _TAR_GZ_PKG_STORAGE_HASH[4:],
+                        file_storage_hash[:2],
+                        file_storage_hash[2:4],
+                        file_storage_hash[4:],
                         filename,
                     ]
                 ),
@@ -2658,6 +2670,23 @@ def storage_service_store(path, file_path, *, meta):
                     "package-type": "bdist_wheel",
                     "python-version": "cp34",
                 },
+            ),
+            pretend.call(
+                "/".join(
+                    [
+                        file_storage_hash[:2],
+                        file_storage_hash[2:4],
+                        file_storage_hash[4:],
+                        filename + '.metadata',
+                    ]
+                ),
+                mock.ANY,
+                meta={
+                    "project": project.normalized_name,
+                    "version": release.version,
+                    "package-type": "bdist_wheel",
+                    "python-version": "cp34",
+                },
             )
         ]