Add functional test, changelog, avoid forbidden hashes in unit test

Author: sdherr

CHANGES/1371.feature

@@ -0,0 +1 @@
+Implement `layout` option on AptPublication that allows user to choose different cache-friendly style of deb URL.

pulp_deb/tests/functional/api/test_publish.py

@@ -2,6 +2,7 @@
 from debian import deb822
 import os
 import pytest
+import re
 
 from pulp_deb.tests.functional.constants import (
     DEB_FIXTURE_ALT_SINGLE_DIST,
@@ -18,6 +19,9 @@
     DEB_PUBLICATION_ARGS_ONLY_SIMPLE,
     DEB_PUBLICATION_ARGS_ONLY_STRUCTURED,
     DEB_PUBLICATION_ARGS_SIMPLE_AND_STRUCTURED,
+    DEB_PUBLICATION_ARGS_NESTED_ALPHABETICALLY,
+    DEB_PUBLICATION_ARGS_NESTED_BY_DIGEST,
+    DEB_PUBLICATION_ARGS_NESTED_BY_BOTH,
     DEB_PUBLISH_COMPLEX_DEBIAN_SECURITY,
     DEB_PUBLISH_COMPLEX_UBUNTU_BACKPORTS,
     DEB_PUBLISH_EMPTY_REPOSITORY,
@@ -196,6 +200,66 @@ def test_publish_any_repo_version(
         deb_delete_publication(second_publication)
 
 
+@pytest.mark.parallel
+@pytest.mark.parametrize(
+    "publication_args",
+    [
+        DEB_PUBLICATION_ARGS_ONLY_STRUCTURED,
+        DEB_PUBLICATION_ARGS_NESTED_ALPHABETICALLY,
+        DEB_PUBLICATION_ARGS_NESTED_BY_DIGEST,
+        DEB_PUBLICATION_ARGS_NESTED_BY_BOTH,
+    ],
+)
+def test_publish_layout(
+    apt_distribution_api,
+    create_publication_and_verify_repo_version,
+    deb_distribution_factory,
+    download_content_unit,
+    publication_args,
+):
+    """Test whether a the layout parameter is generating expected package URLs
+    and the packages are available.
+
+    The following cases are tested:
+
+    * `Publish a repo where layout is not specified (alphabetical by default).`_
+    * `Publish a repo explicit alphabetical layout.`_
+    * `Publish a repo explicit digest layout.`_
+    * `Publish a repo explicit "both" layout.`_
+    """
+    remote_args = {"distributions": DEB_FIXTURE_SINGLE_DIST}
+
+    # Create a repository and publication.
+    publication, _, _, _ = create_publication_and_verify_repo_version(
+        remote_args, publication_args, is_modified=True
+    )
+
+    # Create a distribution
+    distribution = deb_distribution_factory(publication)
+    distribution = apt_distribution_api.read(distribution.pulp_href)
+
+    # Expected filename format
+    if "layout" not in publication_args or publication_args["layout"] == "nested_alphabetically":
+        expected = r"pool/asgard/[a-z]/"
+    else:  # nested_by_digest or nested_by_both
+        expected = r"pool/asgard/[0-9a-f]{2}/[0-9a-f]{4}/"
+
+    # Verify than an expected Package index exists, and that the expected URL is
+    # generated and that the package is actually available.
+    package_index = download_content_unit(
+        distribution.to_dict()["base_path"], "dists/ragnarok/asguard/binary-ppc64/Packages"
+    )
+    for line in str(package_index):
+        if not line.startswith("Filename:"):
+            continue
+
+        _, _, filename = line.partition(": ")
+        assert re.match(expected, filename)
+
+        package = download_content_unit(distribution.to_dict()["base_path"], filename)
+        assert "404" not in str(package)
+
+
 @pytest.mark.parallel
 @pytest.mark.parametrize(
     "set_on, expect_signed",

pulp_deb/tests/functional/constants.py

@@ -47,6 +47,21 @@ def _clean_dict(d):
 DEB_PUBLICATION_ARGS_ONLY_STRUCTURED = {"simple": False, "structured": True}
 DEB_PUBLICATION_ARGS_SIMPLE_AND_STRUCTURED = {"simple": True, "structured": True}
 DEB_PUBLICATION_ARGS_ALL = {"simple": True, "structured": True, "signing_service": ""}
+DEB_PUBLICATION_ARGS_NESTED_ALPHABETICALLY = {
+    "simple": False,
+    "structured": True,
+    "layout": "nested_alphabetically",
+}
+DEB_PUBLICATION_ARGS_NESTED_BY_DIGEST = {
+    "simple": False,
+    "structured": True,
+    "layout": "nested_by_digest",
+}
+DEB_PUBLICATION_ARGS_NESTED_BY_BOTH = {
+    "simple": False,
+    "structured": True,
+    "layout": "nested_by_both",
+}
 
 DEB_P2P_REMOTE_ARGS_SIMPLE = {"distributions": "default", "policy": "immediate"}
 DEB_P2P_REMOTE_ARGS_STRUCTURED = {"distributions": "ragnarok nosuite", "policy": "immediate"}

pulp_deb/tests/unit/test_models.py

@@ -1,9 +1,9 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
-
 from pulpcore.plugin.models import Artifact, ContentArtifact
+
 from pulp_deb.app.constants import LAYOUT_TYPES
-from pulp_deb.app.models import Package, AptRepository, Release
+from pulp_deb.app.models import AptRepository, Package, Release
 from pulp_deb.app.models.repository import handle_duplicate_releases
 from pulp_deb.app.serializers import Package822Serializer
 
@@ -34,15 +34,14 @@ def setUp(self):
             essential=True,
             maintainer="Utgardloki",
             description="A sea jötunn associated with the ocean.",
+            sha256="eeff11",
         )
         self.package1.save()
         self.artifact1 = Artifact(
             size=42,
             md5="aabb",
             sha1="ccdd",
-            sha224="ddcc",
             sha256="eeff11",
-            sha384="ffee",
             sha512="kkll",
             file=SimpleUploadedFile("test_filename", b"test content"),
         )