From: Dan Fandrich Date: Tue, 17 Sep 2024 22:14:31 +0000 (-0700) Subject: tests: Only log warnings or worse by default in smbserver X-Git-Tag: curl-8_11_0~407 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=895008de991a41fddad3fc9dedfa1279e59d1e23;p=thirdparty%2Fcurl.git tests: Only log warnings or worse by default in smbserver There shouldn't be anything displayed during a normal run, but only if server debugging is enabled. Also, set log_file to a magic value to disable it, otherwise impacket installs its own logger that messes with what we want. Closes #14950 --- diff --git a/tests/smbserver.py b/tests/smbserver.py index 17f0162cea..9f8415e0bd 100755 --- a/tests/smbserver.py +++ b/tests/smbserver.py @@ -90,7 +90,7 @@ class ShutdownHandler(threading.Thread): signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGTERM, signal.SIG_DFL) # Delete any temporary files created by the server during its run - log.info("Deleting %d temporary files", len(self.server.tmpfiles)) + log.info("Deleting %d temporary file(s)", len(self.server.tmpfiles)) for f in self.server.tmpfiles: os.unlink(f) @@ -123,7 +123,7 @@ def smbserver(options): smb_config.set("global", "server_name", "SERVICE") smb_config.set("global", "server_os", "UNIX") smb_config.set("global", "server_domain", "WORKGROUP") - smb_config.set("global", "log_file", "") + smb_config.set("global", "log_file", "None") smb_config.set("global", "credentials_file", "") # We need a share which allows us to test that the server is running @@ -425,7 +425,7 @@ def setup_logging(options): root_logger.setLevel(logging.DEBUG) add_stdout = True else: - root_logger.setLevel(logging.INFO) + root_logger.setLevel(logging.WARNING) if add_stdout: stdout_handler = logging.StreamHandler(sys.stdout)