fixup! refactor(subp): Remove parameter 'combine_capture' (#4555)

tests/unittests/config/test_cc_snap.py

@@ -189,33 +189,32 @@ def test_run_commands_on_non_list_or_dict(self):
 
 
 @pytest.mark.allow_all_subp
-def test_run_command_dict_sorted_as_command_script(caplog, tmp_path):
-    """When commands are a dict, sort them and run."""
-    outfile = f"{tmp_path}/output.log"
-    cmd1 = f'echo "HI" >> {outfile}'
-    cmd2 = f'echo "MOM" >> {outfile}'
-    commands = {"02": cmd1, "01": cmd2}
-    run_commands(commands=commands)
-
-    expected_messages = ["Running user-provided snap commands"]
-    for message in expected_messages:
-        assert message in caplog.text
-    assert "MOM\nHI\n" == util.load_file(outfile)
-
-
-@pytest.mark.allow_all_subp
-def test_run_command_as_lists(caplog, tmp_path):
-    """When commands are specified as a list, run them in order."""
-    outfile = "output.log"
-
-    cmd1 = f'echo "HI" >> {tmp_path}/{outfile}'
-    cmd2 = f'echo "MOM" >> {tmp_path}/{outfile}'
-    commands = [cmd1, cmd2]
-    run_commands(commands=commands)
-
-    assert "Running user-provided snap commands" in caplog.text
-    assert "HI\nMOM\n" == util.load_file(f"{tmp_path}/{outfile}")
-    assert "Non-snap commands in snap config:" in caplog.text
+class TestCommands:
+    def test_run_command_dict_sorted_as_command_script(self, caplog, tmp_path):
+        """When commands are a dict, sort them and run."""
+        outfile = f"{tmp_path}/output.log"
+        cmd1 = f'echo "HI" >> {outfile}'
+        cmd2 = f'echo "MOM" >> {outfile}'
+        commands = {"02": cmd1, "01": cmd2}
+        run_commands(commands=commands)
+
+        expected_messages = ["Running user-provided snap commands"]
+        for message in expected_messages:
+            assert message in caplog.text
+        assert "MOM\nHI\n" == util.load_file(outfile)
+
+    def test_run_command_as_lists(self, caplog, tmp_path):
+        """When commands are specified as a list, run them in order."""
+        outfile = "output.log"
+
+        cmd1 = f'echo "HI" >> {tmp_path}/{outfile}'
+        cmd2 = f'echo "MOM" >> {tmp_path}/{outfile}'
+        commands = [cmd1, cmd2]
+        run_commands(commands=commands)
+
+        assert "Running user-provided snap commands" in caplog.text
+        assert "HI\nMOM\n" == util.load_file(f"{tmp_path}/{outfile}")
+        assert "Non-snap commands in snap config:" in caplog.text
 
 
 @skipUnlessJsonSchema()