wip

Author: aaxelb

elasticsearch_metrics/management/commands/djelme_backend_types.py

@@ -1,4 +1,4 @@
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
 from elasticsearch_metrics.registry import djelme_registry
 from elasticsearch_metrics.management.color import color_style
@@ -14,18 +14,13 @@ def add_arguments(self, parser):
 
     def handle(self, *args, **options):
         style = color_style()
-        if options["app_label"]:
-            if options["app_label"] not in djelme_registry.each_app_label():
-                raise CommandError(
-                    "No recordtypes found for app '{}'".format(options["app_label"])
-                )
-            app_labels = [options["app_label"]]
-        else:
-            app_labels = list(djelme_registry.each_app_label())
-        for app_label in app_labels:
-            self.stdout.write(
-                "Recordtypes for '{}':".format(app_label), style.MIGRATE_HEADING
-            )
+        _app_labels = (
+            [options["app_label"]]
+            if options["app_label"]
+            else list(djelme_registry.each_app_label())
+        )
+        for app_label in _app_labels:
+            self.stdout.write(f"Recordtypes for {app_label!r}", style.MIGRATE_HEADING)
             for _recordtype in djelme_registry.each_recordtype(app_label=app_label):
                 _recordtype_name = style.TYPENAME(_recordtype.__name__)
                 self.stdout.write(f"{app_label}.{_recordtype_name}")

elasticsearch_metrics/tests/test_management_commands/test_djelme_check.py

@@ -44,3 +44,7 @@ def test_exits_with_success(self):
             + self.mock8_simple_check_djelme_setup.call_count
         )
         assert _call_count == len(list(registry.each_recordtype()))
+
+    def test_with_invalid_app(self):
+        with self.assertRaises(LookupError):
+            self.run_mgmt_command(djelme_backend_check, "notanapp")

elasticsearch_metrics/tests/test_management_commands/test_djelme_indexes.py

@@ -98,3 +98,7 @@ def test_delete_expired_really(self):
                 mock.call(index="dummy8app_happen_2016.4."),
             ],
         )
+
+    def test_with_invalid_app(self):
+        with self.assertRaises(LookupError):
+            self.run_mgmt_command(djelme_indexes, "notanapp")

elasticsearch_metrics/tests/test_management_commands/test_djelme_setup.py

@@ -1,7 +1,5 @@
 import unittest
 
-from django.core.management import CommandError
-
 from elasticsearch_metrics.imps import elastic8
 from elasticsearch_metrics.management.commands import djelme_backend_setup
 from elasticsearch_metrics.registry import djelme_registry
@@ -32,9 +30,8 @@ def test_without_args(self):
         assert "Synchronized recordtypes." in out
 
     def test_with_invalid_app(self):
-        with self.assertRaises(CommandError) as _raises:
+        with self.assertRaises(LookupError):
             self.run_mgmt_command(djelme_backend_setup, "notanapp")
-        assert "No recordtypes found for app 'notanapp'" in str(_raises.exception)
 
     def test_with_app_label(self):
         class DummyMetric2(elastic8.SimpleRecord):

elasticsearch_metrics/tests/test_management_commands/test_djelme_types.py

@@ -3,18 +3,14 @@
 
 
 class TestDjelmeTypesCommand(SimpleDjelmeTestCase):
-    def test_without_args_by_name(self):
+    def test_without_args(self):
         out, err = self.run_mgmt_command(djelme_backend_types)
         assert "Dummy8Event" in out
         assert "Monthly8Event" in out
         assert "ThingHappened" in out
         assert "ThingHappeningsReport" in out
         assert "SimpleKV" in out
 
-    def test_without_args_by_command(self):
-        out, err = self.run_mgmt_command("djelme_backend_types")
-        assert "Dummy8Event" in out
-        assert "Monthly8Event" in out
-        assert "ThingHappened" in out
-        assert "ThingHappeningsReport" in out
-        assert "SimpleKV" in out
+    def test_with_invalid_app(self):
+        with self.assertRaises(LookupError):
+            self.run_mgmt_command(djelme_backend_types, "notanapp")

elasticsearch_metrics/tests/test_registry.py

@@ -31,10 +31,7 @@ def test_get_recordtype(self):
 
         with self.assertRaises(LookupError) as excinfo:
             djelme_registry.get_recordtype("notanapp", "Dummy8Event")
-        assert (
-            "No recordtypes found in app with label 'notanapp'."
-            in excinfo.exception.args[0]
-        )
+        assert "'notanapp'" in excinfo.exception.args[0]
 
     def test_get_recordtypes(self):
         class AnotherRecord(elastic8.TimeseriesRecord):
@@ -50,10 +47,7 @@ class Meta:
 
         with self.assertRaises(LookupError) as excinfo:
             list(djelme_registry.each_recordtype(app_label="notanapp"))
-        assert (
-            "No recordtypes found in app with label 'notanapp'."
-            in excinfo.exception.args[0]
-        )
+        assert "'notanapp'" in excinfo.exception.args[0]
 
     def test_get_recordtypes_excludes_abstract_recordtypes(self):
         class AbstractRecord(elastic8.TimeseriesRecord):