diff options
author | Marc Hoersken <info@marc-hoersken.de> | 2020-11-14 21:32:33 +0100 |
---|---|---|
committer | Marc Hoersken <info@marc-hoersken.de> | 2020-11-14 21:32:33 +0100 |
commit | 24f909cebd8b79abf7b7368b649f5dace1a2449f (patch) | |
tree | 011a765a07dbeed2ce45b5d8c389ea6d94624f71 /tests/smbserver.py | |
parent | 03822c3a6d3a0b1b434737eab6d291845f7b30d4 (diff) | |
download | curl-24f909cebd8b79abf7b7368b649f5dace1a2449f.tar.gz |
tests/*server.py: close log file after each log line
Make sure the log file is not locked once a test has
finished and align with the behavior of our logmsg.
Rename curl_test_data.py to be a general util.py.
Format and sort Python imports with isort/VSCode.
Bug: #6058
Closes #6206
Diffstat (limited to 'tests/smbserver.py')
-rwxr-xr-x | tests/smbserver.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/smbserver.py b/tests/smbserver.py index cdcfc1551..a49023b0f 100755 --- a/tests/smbserver.py +++ b/tests/smbserver.py @@ -21,21 +21,23 @@ # """Server for testing SMB""" -from __future__ import (absolute_import, division, print_function) +from __future__ import absolute_import, division, print_function # NOTE: the impacket configuration is not unicode_literals compatible! + import argparse +import logging import os import sys -import logging import tempfile + +# Import our curl test data helper +from util import ClosingFileHandler, TestData + if sys.version_info.major >= 3: import configparser else: import ConfigParser as configparser -# Import our curl test data helper -import curl_test_data - # impacket needs to be installed in the Python environment try: import impacket @@ -43,10 +45,10 @@ except ImportError: sys.stderr.write('Python package impacket needs to be installed!\n') sys.stderr.write('Use pip or your package manager to install it.\n') sys.exit(1) -from impacket import smbserver as imp_smbserver from impacket import smb as imp_smb -from impacket.nt_errors import (STATUS_ACCESS_DENIED, STATUS_SUCCESS, - STATUS_NO_SUCH_FILE) +from impacket import smbserver as imp_smbserver +from impacket.nt_errors import (STATUS_ACCESS_DENIED, STATUS_NO_SUCH_FILE, + STATUS_SUCCESS) log = logging.getLogger(__name__) SERVER_MAGIC = "SERVER_MAGIC" @@ -120,7 +122,7 @@ class TestSmbServer(imp_smbserver.SMBSERVER): config_parser=config_parser) # Set up a test data object so we can get test data later. - self.ctd = curl_test_data.TestData(test_data_directory) + self.ctd = TestData(test_data_directory) # Override smbComNtCreateAndX so we can pretend to have files which # don't exist. @@ -353,7 +355,7 @@ def setup_logging(options): # Write out to a logfile if options.logfile: - handler = logging.FileHandler(options.logfile, mode="w") + handler = ClosingFileHandler(options.logfile) handler.setFormatter(formatter) handler.setLevel(logging.DEBUG) root_logger.addHandler(handler) |