add tests for #53 and #52

Author: bckohan

.gitignore

@@ -162,4 +162,4 @@ cython_debug/
 **/.DS_Store
 **/track.json
 poetry.lock
-
+CLAUDE.md

src/django_routines/management/commands/routine.py

@@ -110,6 +110,8 @@ class Command(TyperCommand, rich_markup_mode="rich"):
     _routine_options: t.Dict[str, t.Any] = {}
     _previous_command: t.Optional[RCommand] = None
 
+    _results: t.List[t.Any] = []
+
     @property
     def routine(self) -> t.Optional[Routine]:
         """
@@ -149,6 +151,7 @@ def init(
         ] = manage_script,
         verbosity: Verbosity = verbosity,
     ):
+        self._results = []
         self._routine_options = ctx.params.copy()
         self.verbosity = verbosity
         self._pass_verbosity = (
@@ -169,7 +172,7 @@ def finished(self, results: t.List[t.Any]):
                 import_string(self.routine.finalize)
                 if isinstance(self.routine.finalize, str)
                 else self.routine.finalize
-            )(self.routine, results)
+            )(self.routine, self._results)
 
     def _run_routine(
         self,
@@ -302,6 +305,7 @@ def _call_command(
         if self.verbosity > 0:
             self.secho(command.command_str, fg="cyan")
         command.result = call_command(cmd, *command.command_args, **options)
+        self._results.append(command.result)
         if command.command_name == "makemigrations":
             importlib.invalidate_caches()
         if command.post_hook:
@@ -387,6 +391,7 @@ def _subprocess(
             self.secho(" ".join(args), fg="cyan")
 
         command.result = subprocess.run(args, env=os.environ.copy())
+        self._results.append(command.result)
         if command.result.returncode > 0:
             raise CommandError(
                 _(

tests/django_routines_tests/management/commands/track.py

@@ -34,3 +34,4 @@ def handle(self, *args, **options) -> t.Optional[str]:
         track_file.write_text(json.dumps(track, indent=4))
         if options["raise"]:
             raise TestError("Kill the op.")
+        return str(options["id"])

tests/test_core.py

@@ -129,14 +129,18 @@ def test_command(self, no_color=True, verbosity=None, subprocess=False):
         expected = [3, 4, 1]
         sys_expected = ["sys 1", "sys 2"]
         if verbosity is None or verbosity > 0:
+            expected_output = []
+            for exp in expected:
+                if not subprocess:
+                    expected_output.append(f"track {exp}")
+                expected_output.append(str(exp))
+            for exp in sys_expected:
+                expected_output.append(f"system_cmd.py {exp}")
             for line, exp in zip(
                 self.lines(out.getvalue(), no_color=no_color),
-                [
-                    *[f"track {exp}" for exp in expected],
-                    *[f"system_cmd.py {exp}" for exp in sys_expected],
-                ],
+                expected_output,
             ):
-                self.assertTrue(exp in line)
+                self.assertTrue(exp in line, f"{exp} not in {line}")
         else:
             self.assertTrue("track" not in out.getvalue().strip())
             self.assertTrue("system_cmd" not in out.getvalue().strip())
@@ -172,12 +176,16 @@ def test_command(self, no_color=True, verbosity=None, subprocess=False):
         call_command(*command, "--all", stdout=out)
         expected = [2, 0, 3, 4, 1, 5]
         if verbosity is None or verbosity > 0:
+            expected_output = []
+            for exp in expected:
+                if not subprocess:
+                    expected_output.append(f"track {exp}")
+                expected_output.append(str(exp))
+            for exp in sys_expected:
+                expected_output.append(f"system_cmd.py {exp}")
             for line, exp in zip(
                 self.lines(out.getvalue(), no_color=no_color),
-                [
-                    *[f"track {exp}" for exp in expected],
-                    *[f"system_cmd.py {exp}" for exp in sys_expected],
-                ],
+                expected_output,
             ):
                 self.assertTrue(exp in line)
         else:
@@ -222,12 +230,16 @@ def test_command(self, no_color=True, verbosity=None, subprocess=False):
         call_command(*command, "--demo", stdout=out)
         expected = [2, 3, 4, 1, 5]
         if verbosity is None or verbosity > 0:
+            expected_output = []
+            for exp in expected:
+                if not subprocess:
+                    expected_output.append(f"track {exp}")
+                expected_output.append(str(exp))
+            for exp in sys_expected:
+                expected_output.append(f"system_cmd.py {exp}")
             for line, exp in zip(
                 self.lines(out.getvalue(), no_color=no_color),
-                [
-                    *[f"track {exp}" for exp in expected],
-                    *[f"system_cmd.py {exp}" for exp in sys_expected],
-                ],
+                expected_output,
             ):
                 self.assertTrue(exp in line)
         else:
@@ -265,12 +277,16 @@ def test_command(self, no_color=True, verbosity=None, subprocess=False):
         call_command(*command, "--demo", "--import", stdout=out)
         expected = [2, 0, 3, 4, 1, 5]
         if verbosity is None or verbosity > 0:
+            expected_output = []
+            for exp in expected:
+                if not subprocess:
+                    expected_output.append(f"track {exp}")
+                expected_output.append(str(exp))
+            for exp in sys_expected:
+                expected_output.append(f"system_cmd.py {exp}")
             for line, exp in zip(
                 self.lines(out.getvalue(), no_color=no_color),
-                [
-                    *[f"track {exp}" for exp in expected],
-                    *[f"system_cmd.py {exp}" for exp in sys_expected],
-                ],
+                expected_output,
             ):
                 self.assertTrue(exp in line)
         else:
@@ -315,12 +331,16 @@ def test_command(self, no_color=True, verbosity=None, subprocess=False):
         call_command(*command, "--import", stdout=out)
         expected = [2, 0, 3, 4, 1]
         if verbosity is None or verbosity > 0:
+            expected_output = []
+            for exp in expected:
+                if not subprocess:
+                    expected_output.append(f"track {exp}")
+                expected_output.append(str(exp))
+            for exp in sys_expected:
+                expected_output.append(f"system_cmd.py {exp}")
             for line, exp in zip(
                 self.lines(out.getvalue(), no_color=no_color),
-                [
-                    *[f"track {exp}" for exp in expected],
-                    *[f"system_cmd.py {exp}" for exp in sys_expected],
-                ],
+                expected_output,
             ):
                 self.assertTrue(exp in line)
         else: