Merge pull request #557 from mmasque/fix-binary-exit-code

Add a wrapper function to the main entrypoint

RedfishServiceValidator.py

@@ -7,5 +7,4 @@
 import sys
 
 if __name__ == '__main__':
-    status_code, lastResultsPage, exit_string = main()
-    sys.exit(status_code)
+    sys.exit(main())

redfish_service_validator/RedfishServiceValidator.py

@@ -42,7 +42,7 @@ def verbose2(self, msg, *args, **kwargs):
 standard_out.setLevel(logging.INFO)
 my_logger.addHandler(standard_out)
 
-def main(argslist=None, configfile=None):
+def validate(argslist=None, configfile=None):
     """Main command
 
     Args:
@@ -242,7 +242,12 @@ def main(argslist=None, configfile=None):
 
     return status_code, lastResultsPage, 'Validation done'
 
+def main():
+    """
+    Entry point for the program.
+    """
+    status_code, _, _ = validate()
+    return status_code
 
 if __name__ == '__main__':
-    status_code, lastResultsPage, exit_string = main()
-    sys.exit(status_code)
+    sys.exit(main())

redfish_service_validator/RedfishServiceValidatorGui.py

@@ -324,7 +324,7 @@ def run_imp( self ):
         # Launch the validator
         try:
             rsv_config = self.build_config_parser( False )
-            status_code, last_results_page, exit_string = rsv.main(configfile = rsv_config )
+            status_code, last_results_page, exit_string = rsv.validate( configfile = rsv_config )
             if last_results_page is not None:
                 webbrowser.open_new( last_results_page )
             else: