formatting and tests

Signed-off-by: Alex Flom <[email protected]>

tests/trestlebot/test_cli.py

@@ -16,7 +16,6 @@
 
 """Test for CLI"""
 
-import logging
 import sys
 from typing import List
 
@@ -47,7 +46,7 @@ def args_dict_to_list(args_dict: dict) -> List[str]:
     return args
 
 
-def test_invalid_assemble_model(monkeypatch, valid_args_dict, caplog):
+def test_invalid_assemble_model(monkeypatch, valid_args_dict, capsys):
     """Test invalid assemble model"""
     args_dict = valid_args_dict
     args_dict["assemble-model"] = "fake"
@@ -56,15 +55,14 @@ def test_invalid_assemble_model(monkeypatch, valid_args_dict, caplog):
     with pytest.raises(SystemExit):
         cli_main()
 
-    assert any(
-        record.levelno == logging.ERROR
-        and record.message
-        == "Invalid value fake for assemble model. Please use catalog, profile, compdef, or ssp."
-        for record in caplog.records
+    captured = capsys.readouterr()
+    assert (
+        "Invalid value fake for assemble model. Please use catalog, profile, compdef, or ssp."
+        in captured.err
     )
 
 
-def test_no_ssp_index(monkeypatch, valid_args_dict, caplog):
+def test_no_ssp_index(monkeypatch, valid_args_dict, capsys):
     """Test invalid assemble model"""
     args_dict = valid_args_dict
     args_dict["assemble-model"] = "ssp"
@@ -74,9 +72,6 @@ def test_no_ssp_index(monkeypatch, valid_args_dict, caplog):
     with pytest.raises(SystemExit):
         cli_main()
 
-    assert any(
-        record.levelno == logging.ERROR
-        and record.message
-        == "Must set ssp_index_path when using SSP as assemble model."
-        for record in caplog.records
-    )
+    captured = capsys.readouterr()
+
+    assert "Must set ssp_index_path when using SSP as assemble model." in captured.err

trestlebot/cli.py

@@ -28,8 +28,7 @@
 from trestlebot.tasks.base_task import TaskBase
 
 
-logger = logging.getLogger('trestlebot')
-
+logger = logging.getLogger("trestlebot")
 
 
 def _parse_cli_arguments() -> argparse.Namespace:

trestlebot/log.py

@@ -20,18 +20,21 @@
 from types import TracebackType
 from typing import Optional, Type
 
+
 # Singleton logger instance
 # All other CLI sub module will inherit settings of this logger as long as
 # sub-module instantiates a logger with a prefix 'trestlebot' or __name__
-_logger = logging.getLogger('trestlebot')
+_logger = logging.getLogger("trestlebot")
 
 
 class SpecificLevelFilter(logging.Filter):
     """
     Filter for the same level as provided by setLevel for a log handler.
 
-    Python by default logs all levels above to a given destination. This makes it easy to split levels where you might
-    log all levels to file and only errors to std.err, however, does not allow logging a specific level elsewhere.
+    Python by default logs all levels above to a given destination.
+    This makes it easy to split levels where you might
+    log all levels to file and only errors to std.err,
+    however, does not allow logging a specific level elsewhere.
     """
 
     def __init__(self, level: int) -> None:
@@ -67,8 +70,12 @@ def set_global_logging_levels(level: int = logging.INFO) -> None:
     console_error_handler = logging.StreamHandler(sys.stderr)
     console_error_handler.setLevel(logging.WARNING)
     # create formatters
-    error_formatter = logging.Formatter('%(name)s:%(lineno)d %(levelname)s: %(message)s')
-    debug_formatter = logging.Formatter('%(name)s:%(lineno)d %(levelname)s: %(message)s')
+    error_formatter = logging.Formatter(
+        "%(name)s:%(lineno)d %(levelname)s: %(message)s"
+    )
+    debug_formatter = logging.Formatter(
+        "%(name)s:%(lineno)d %(levelname)s: %(message)s"
+    )
     console_debug_handler.setFormatter(debug_formatter)
     console_error_handler.setFormatter(error_formatter)
     # add ch to logger
@@ -78,7 +85,9 @@ def set_global_logging_levels(level: int = logging.INFO) -> None:
 
 
 def _exception_handler(
-    exception_type: Type[BaseException], exception: BaseException, traceback: Optional[TracebackType]
+    exception_type: Type[BaseException],
+    exception: BaseException,
+    traceback: Optional[TracebackType],
 ) -> None:
     """Empty exception handler to prevent stack traceback in quiet mode."""
     logging.warning(exception)
@@ -111,7 +120,7 @@ def get_current_verbosity_level(logger: logging.Logger) -> int:
     return 0
 
 
-class Trace():
+class Trace:
     """Class allowing low priority trace message when verbose > 1 and log level below DEBUG."""
 
     def __init__(self, logger: logging.Logger) -> None:

trestlebot/tasks/authored/catalog.py

@@ -28,6 +28,7 @@
     AuthorObjectBase,
 )
 
+
 class AuthoredCatalog(AuthorObjectBase):
     """
     Functions for authoring OSCAL catalogs in automation

trestlebot/tasks/authored/compdef.py

@@ -28,6 +28,7 @@
     AuthorObjectBase,
 )
 
+
 class AuthoredComponentsDefinition(AuthorObjectBase):
     """
     Functions for authoring OSCAL Component Definitions in automation

trestlebot/tasks/authored/profile.py

@@ -28,6 +28,7 @@
     AuthorObjectBase,
 )
 
+
 class AuthoredProfile(AuthorObjectBase):
     """
     Functions for authoring OSCAL Profiles in automation

trestlebot/tasks/authored/ssp.py

@@ -29,6 +29,7 @@
     AuthorObjectBase,
 )
 
+
 class AuthoredSSP(AuthorObjectBase):
     """
     Functions for authoring OSCAL SSPs in automation