Merge pull request #3195 from Flamefire/logging

Optionally call log.warning in print_warning

easybuild/tools/build_log.py

@@ -358,10 +358,13 @@ def print_warning(msg, *args, **kwargs):
     if args:
         msg = msg % args
 
+    log = kwargs.pop('log', None)
     silent = kwargs.pop('silent', False)
     if kwargs:
         raise EasyBuildError("Unknown named arguments passed to print_warning: %s", kwargs)
 
+    if log:
+        log.warning(msg)
     if not silent:
         sys.stderr.write("\nWARNING: %s\n\n" % msg)
 

test/framework/build_log.py

@@ -237,11 +237,11 @@ def test_log_levels(self):
 
     def test_print_warning(self):
         """Test print_warning"""
-        def run_check(args, silent=False, expected_stderr=''):
+        def run_check(args, silent=False, expected_stderr='', **kwargs):
             """Helper function to check stdout/stderr produced via print_warning."""
             self.mock_stderr(True)
             self.mock_stdout(True)
-            print_warning(*args, silent=silent)
+            print_warning(*args, silent=silent, **kwargs)
             stderr = self.get_stderr()
             stdout = self.get_stdout()
             self.mock_stdout(False)
@@ -258,6 +258,14 @@ def run_check(args, silent=False, expected_stderr=''):
 
         self.assertErrorRegex(EasyBuildError, "Unknown named arguments", print_warning, 'foo', unknown_arg='bar')
 
+        # test passing of logger to print_warning
+        tmp_logfile = os.path.join(self.test_prefix, 'test.log')
+        logger, _ = init_logging(tmp_logfile, silent=True)
+        expected = "\nWARNING: Test log message with a logger involved.\n\n"
+        run_check(["Test log message with a logger involved."], expected_stderr=expected, log=logger)
+        log_txt = read_file(tmp_logfile)
+        self.assertTrue("WARNING Test log message with a logger involved." in log_txt)
+
     def test_print_error(self):
         """Test print_error"""
         def run_check(args, silent=False, expected_stderr=''):