test: clean up imports and add assertions

Author: itkovian

lib/vsc/utils/script_tools.py

@@ -307,23 +307,22 @@ def __init__(self, name=None):
         if isinstance(self, HAMixin):
             argparser = populate_config_parser(argparser, self.__class__.HA_MIXIN_OPTIONS)
 
+        if isinstance(self, LogMixin):
+            argparser = populate_config_parser(argparser, self.__class__.LOG_MIXIN_OPTIONS)
+
         if isinstance(self, TimestampMixin):
             argparser = populate_config_parser(argparser, self.__class__.TIMESTAMP_MIXIN_OPTIONS)
 
         if isinstance(self, LockMixin):
             argparser = populate_config_parser(argparser, self.__class__.LOCK_MIXIN_OPTIONS)
 
-        if isinstance(self, LogMixin):
-            argparser = populate_config_parser(argparser, self.__class__.LOG_MIXIN_OPTIONS)
-
         if isinstance(self, NagiosStatusMixin):
             argparser = populate_config_parser(argparser, self.__class__.NAGIOS_MIXIN_OPTIONS)
 
         argparser = populate_config_parser(argparser, self.get_options())
 
         self.options = argparser.parse_args()
 
-
     def critical(self, msg):
         if isinstance(self, NagiosStatusMixin):
             self.nagios_epilogue(NAGIOS_CRITICAL, msg)
@@ -361,7 +360,7 @@ def main(self):
         #errors = []
 
         msg = self.name
-        if self.options.dry_run:
+        if msg and self.options.dry_run:
             msg += " (dry-run)"
         logging.info("%s started.", msg)
 
@@ -412,6 +411,9 @@ def main(self):
         if isinstance(self, NagiosStatusMixin):
             self.nagios_epilogue()
 
+        if isinstance(self, LogMixin):
+            self.log_epilogue()
+
 
 class FullCLIBase(HAMixin, LockMixin, TimestampMixin, LogMixin, NagiosStatusMixin, CLIBase):
     """
@@ -438,6 +440,12 @@ def _merge_options(options):
     return opts
 
 
+class CLI(FullCLIBase):
+
+    def __init__(self, name=None, default_options=None):  # pylint: disable=unused-argument
+        super().__init__(name)
+
+
 @deprecated_class("Base your scripts on the CLIBase class instead")
 class ExtendedSimpleOption(SimpleOption):
     """
@@ -564,11 +572,6 @@ def critical_exception_handler(self, tp, value, traceback):
         self.critical(message)
 
 
-class CLI(FullCLIBase):
-
-    def __init__(self, name=None, default_options=None):  # pylint: disable=unused-argument
-        super().__init__(name)
-
 @deprecated_class("Base your scripts on the CLIBase class instead")
 class OldCLI:
     """