Add stubbed CLI test case, modify delete command and settings file

Author: synkd

manifester/commands.py

@@ -18,21 +18,22 @@ def cli():
 
 @cli.command()
 @click.option(
-    "--manifest_category",
+    "--manifest-category",
     type=str,
     help="Category of manifest (golden_ticket or robottelo_automation by default)",
 )
-@click.option("--allocation_name", type=str, help="Name of upstream subscription allocation")
-def get_manifest(manifest_category, allocation_name):
+@click.option("--allocation-name", type=str, help="Name of upstream subscription allocation")
+@click.option("--requester", type=str, default=None)
+def get_manifest(manifest_category, allocation_name, requester):
     """Return a subscription manifester based on the settings for the provided manifest_category."""
-    manifester = Manifester(manifest_category, allocation_name, cli=True)
+    manifester = Manifester(manifest_category, allocation_name, requester=requester)
     manifester.create_subscription_allocation()
     for sub in manifester.subscription_data:
         manifester.process_subscription_pools(
             subscription_pools=manifester.subscription_pools,
             subscription_data=sub,
         )
-    manifester.trigger_manifest_export()
+    return manifester.trigger_manifest_export()
 
 
 @cli.command()
@@ -54,14 +55,14 @@ def delete(allocations, all_, remove_manifest_file):
     """Delete subscription allocations in inventory and optionally delete local manifest files."""
     inv = helpers.load_inventory_file(Path(settings.inventory_path))
     for num, allocation in enumerate(inv):
-        if remove_manifest_file:
-            Path(
-                f"{os.environ['MANIFESTER_DIRECTORY']}/manifests/{allocation.get('name')}_manifest.zip"
-            ).unlink()
         if str(num) in allocations or allocation.get("name") in allocations or all_:
             Manifester(minimal_init=True).delete_subscription_allocation(
                 uuid=allocation.get("uuid")
             )
+            if remove_manifest_file:
+                Path(
+                    f"{os.environ['MANIFESTER_DIRECTORY']}/manifests/{allocation.get('name')}_manifest.zip"
+                ).unlink()
 
 
 @cli.command()

tests/test_manifester.py

@@ -305,3 +305,27 @@ def test_update_inventory():
         load_inventory_file(Path(MANIFEST_DATA["inventory_path"]))
         == SUB_ALLOCATIONS_RESPONSE["body"]
     )
+
+
+# CLI test case is currently manual
+
+
+def test_cli_end_to_end():
+    """Test that manifester's get-manifest cli command returns a manifest.
+
+    Steps to test:
+    1. Generate a new manifest with 'manifester get-manifest --manifest-category golden_ticket`
+    2. Generate three additional manifests using the same command as step 1
+    3. Verify that the four manifest file are present in the `./manifests/` directory
+    4. Verify that the manifests contain the expected subscriptions with `rct cat-manifest
+       <manifest file>`
+    5. Verify that all four manifests are present in the local inventory with `manifester inventory`
+    6. Verify that a subscription allocation can be deleted by inventory index with `manifester
+       delete 0`
+    7. Verify that a subscription allocation can be deleted by name with `manifester delete
+       <allocation name>`
+    8. Verify that all remaining allocations can be deleted and that the corresponding manifest
+       files can be deleted as well with `manifester delete --all --remove-manifest-file`
+    9. Run `manifester inventory --sync` and verify that none of the allocations created above
+       are present in the inventory
+    """