Corrected error in mirror.create filter_with_deps

* Fixed Mirror.Create. It didn't make use of filter_with_deps argument.
* Organized Mirror.create statements to make them easier to follow.
* Created unit tests for Mirror.Create to make sure post request is
  created correctly.
* Renamed misleading test named test_create to test_mirror_from_response
  and cleaned up the function.

Author: Greg Land

aptly_api/parts/mirrors.py

@@ -59,17 +59,20 @@ def mirror_from_response(api_response: Dict[str, str]) -> Mirror:
                         ) if "Filter" in api_response else None,
             status=cast(int, api_response["Status"]
                         )if "Status" in api_response else None,
-            worker_pid=cast(
-                int, api_response["WorkerPID"])
-            if "WorkerPID" in api_response else None,
-            filter_with_deps=cast(bool, api_response["FilterWithDeps"]),
-            skip_component_check=cast(
-                bool, api_response["SkipComponentCheck"]),
-            skip_architecture_check=cast(
-                bool, api_response["SkipArchitectureCheck"]),
-            download_sources=cast(bool, api_response["DownloadSources"]),
-            download_udebs=cast(bool, api_response["DownloadUdebs"]),
-            download_installer=cast(bool, api_response["DownloadInstaller"])
+            worker_pid=cast( int, api_response["WorkerPID"]
+                            ) if "WorkerPID" in api_response else None,
+            filter_with_deps=cast(bool, api_response["FilterWithDeps"]
+                                  ) if "FilterWithDeps" in api_response else False,
+            skip_component_check=cast(bool, api_response["SkipComponentCheck"]
+                                      ) if "SkipComponentCheck" in api_response else False,
+            skip_architecture_check=cast(bool, api_response["SkipArchitectureCheck"]
+                                         ) if "SkipArchitectureCheck" in api_response else False,
+            download_sources=cast(bool, api_response["DownloadSources"]
+                                  ) if "DownloadSources" in api_response else False,
+            download_udebs=cast(bool, api_response["DownloadUdebs"]
+                                ) if "DownloadUdebs" in api_response else False,
+            download_installer=cast(bool, api_response["DownloadInstaller"]
+                                    ) if "DownloadInstaller" in api_response else False,
         )
 
     def list(self) -> Sequence[Mirror]:
@@ -158,32 +161,37 @@ def create(self, name: str, archiveurl: str, distribution: Optional[str] = None,
                architectures: Optional[List[str]] = None, keyrings: Optional[List[str]] = None,
                download_sources: bool = False, download_udebs: bool = False,
                download_installer: bool = False, filter_with_deps: bool = False,
-               skip_component_check: bool = False, ignore_signatures: bool = False) -> Mirror:
+               skip_component_check: bool = False, skip_architecture_check: bool = False,
+               ignore_signatures: bool = False) -> Mirror:
         data = {
             "Name": name,
             "ArchiveURL": archiveurl
         }  # type: T_BodyDict
 
-        if ignore_signatures:
-            data["IgnoreSignatures"] = ignore_signatures
-        if keyrings:
-            data["Keyrings"] = keyrings
-        if filter:
-            data["Filter"] = filter
         if distribution:
             data["Distribution"] = distribution
+        if filter:
+            data["Filter"] = filter
         if components:
             data["Components"] = components
         if architectures:
             data["Architectures"] = architectures
+        if keyrings:
+            data["Keyrings"] = keyrings
         if download_sources:
             data["DownloadSources"] = download_sources
         if download_udebs:
             data["DownloadUdebs"] = download_udebs
         if download_installer:
             data["DownloadInstaller"] = download_installer
+        if filter_with_deps:
+            data["FilterWithDeps"] = filter_with_deps
         if skip_component_check:
             data["SkipComponentCheck"] = skip_component_check
+        if skip_architecture_check:
+            data["SkipArchitectureCheck"] = skip_architecture_check
+        if ignore_signatures:
+            data["IgnoreSignatures"] = ignore_signatures
 
         resp = self.do_post("api/mirrors", json=data)
 

aptly_api/tests/test_mirrors.py

@@ -5,6 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from typing import Any
 from unittest.case import TestCase
+from inspect import signature
+import json
 
 import requests_mock
 
@@ -19,38 +21,93 @@ def __init__(self, *args: Any) -> None:
         self.miapi = MirrorsAPISection("http://test/")
 
     def test_create(self, *, rmock: requests_mock.Mocker) -> None:
-        rmock.post("http://test/api/mirrors",
-                   text="""{"UUID": "2cb5985a-a23f-4a1f-8eb6-d5409193b4eb",
-                   "Name": "aptly-mirror",
-                   "ArchiveRoot": "https://deb.nodesource.com/node_10.x/",
-                   "Distribution": "bionic", "Components": ["main"],
-                   "Architectures": ["amd64"],
-                   "Meta": [{"Architectures": "i386 amd64 armhf arm64",
-                   "Codename": "bionic", "Components": "main",
-                   "Date": "Tue, 06 Apr 2021 21:05:41 UTC",
-                   "Description": " Apt Repository for the Node.JS 10.x Branch",
-                   "Label": "Node Source", "Origin": "Node Source"}],
-                   "LastDownloadDate": "0001-01-01T00:00:00Z",
-                   "Filter": "test", "Status": 0, "WorkerPID": 0,
-                   "FilterWithDeps": true, "SkipComponentCheck": true,
-                   "SkipArchitectureCheck": true, "DownloadSources": true,
-                   "DownloadUdebs": true, "DownloadInstaller": true}"""
-                   )
+        expected = {"Name": "testname", "ArchiveURL": "http://randomurl.url"}
+
+        rmock.post("http://test/api/mirrors", text="""{"Name":"nocheck", "ArchiveRoot":"nocheck"}""")
+        self.miapi.create(expected["Name"], expected["ArchiveURL"])
+
+        self.assertEqual(rmock.request_history[0].method, "POST")
+        self.assertEqual(len(rmock.request_history[0].json()), len(expected))
+        self.assertEqual(rmock.request_history[0].json(), expected)
+
+    def test_create_all_args(self, *, rmock: requests_mock.Mocker) -> None:
+        expected = {
+            "Name": "aptly-mirror",
+            "ArchiveURL": "https://deb.nodesource.com/node_10.x/",
+            "Distribution": "bionic",
+            "Filter": "test",
+            "Components": ["main"],
+            "Architectures": ["amd64"],
+            "Keyrings": ["/path/to/keyring"],
+            "DownloadSources": True,
+            "DownloadUdebs": True,
+            "DownloadInstaller": True,
+            "FilterWithDeps": True,
+            "SkipComponentCheck": True,
+            "SkipArchitectureCheck": True,
+            "IgnoreSignatures": True,
+        }
+        # Keep us from getting out of lockstep with the number of args to create
+        self.assertEqual(len(signature(self.miapi.create).parameters), len(expected))
+
+        rmock.post("http://test/api/mirrors", text="""{"Name":"nocheck", "ArchiveRoot":"nocheck"}""")
+        self.miapi.create(
+            name="aptly-mirror",
+            archiveurl="https://deb.nodesource.com/node_10.x/",
+            distribution="bionic",
+            filter="test",
+            components=["main"],
+            architectures=["amd64"],
+            keyrings=["/path/to/keyring"],
+            download_sources=True,
+            download_udebs=True,
+            download_installer=True,
+            filter_with_deps=True,
+            skip_component_check=True,
+            skip_architecture_check=True,
+            ignore_signatures=True,
+        )
+
+        self.assertEqual(rmock.request_history[0].method, "POST")
+        self.assertEqual(len(rmock.request_history[0].json()), len(expected))
+        self.assertEqual(rmock.request_history[0].json(), expected)
+
+    def test_mirror_from_response(self, *, rmock: requests_mock.Mocker) -> None:
         self.assertSequenceEqual(
-            self.miapi.create(name="aptly-mirror", archiveurl='https://deb.nodesource.com/node_10.x/',
-                              distribution='bionic', components=["main"],
-                              architectures=["amd64"],
-                              filter="test", download_udebs=True,
-                              download_sources=True, download_installer=True,
-                              skip_component_check=True, filter_with_deps=True,
-                              keyrings=["/path/to/keyring"], ignore_signatures=True),
+            self.miapi.mirror_from_response(
+                json.loads("""{
+                    "UUID": "2cb5985a-a23f-4a1f-8eb6-d5409193b4eb",
+                    "Name": "aptly-mirror",
+                    "ArchiveRoot": "https://deb.nodesource.com/node_10.x/",
+                    "Distribution": "bionic",
+                    "Components": ["main"],
+                    "Architectures": ["amd64"],
+                    "LastDownloadDate": "0001-01-01T00:00:00Z",
+                    "Meta": [{"Architectures": "i386 amd64 armhf arm64",
+                            "Codename": "bionic",
+                            "Components": "main",
+                            "Date": "Tue, 06 Apr 2021 21:05:41 UTC",
+                            "Description": " Apt Repository for the Node.JS 10.x Branch",
+                            "Label": "Node Source",
+                            "Origin": "Node Source"}],
+                    "Filter": "test",
+                    "Status": 0,
+                    "WorkerPID": 0,
+                    "FilterWithDeps": true,
+                    "SkipComponentCheck": true,
+                    "SkipArchitectureCheck": true,
+                    "DownloadSources": true,
+                    "DownloadUdebs": true,
+                    "DownloadInstaller": true
+                }""")
+            ),
             Mirror(
                 uuid='2cb5985a-a23f-4a1f-8eb6-d5409193b4eb',
                 name="aptly-mirror",
                 archiveurl="https://deb.nodesource.com/node_10.x/",
                 distribution='bionic',
-                components=["main"],
-                architectures=["amd64"],
+                components=['main'],
+                architectures=['amd64'],
                 downloaddate='0001-01-01T00:00:00Z',
                 meta=[{"Architectures": "i386 amd64 armhf arm64",
                       "Codename": "bionic",