mirror of
https://github.com/curl/curl.git
synced 2026-04-13 00:31:41 +08:00
f477f3efc3
Data files no longer depend on mixed newline styles. Before this
patch the harness still assumed data files to use LF newlines,
ensured by `.gitattribute` and distributing sources with LF newlines.
To allow using platform native newlines (CRLF on Windows typically),
update the test harness to support data files with any newline style
on disk. And delete `.gitattributes`.
Fix to:
- load original data files (from test/data) so that their newline-style
doesn't matter on the checked out source repo, meaning it works
when its CRLF on Windows, just like any other file.
(if a BOM slips in, it's caught by `spacecheck.pl` as binary content.)
- do the same in `util.py` used by `smbserver.py` (for test 1451).
- also fix `util.py` to use us-ascii encoding for data files, replacing utf-8.
Also:
- runtests: rework the stray CR checker to allow full CRLF data files,
and keep warning for mixed newlines.
Follow-up to 904e7ecb66 #19347
Closes #19398
93 lines
2.8 KiB
Python
Executable File
93 lines
2.8 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
#
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
"""Module for extracting test data from the test data folder and other utils."""
|
|
|
|
from __future__ import (absolute_import, division, print_function,
|
|
unicode_literals)
|
|
|
|
import logging
|
|
import os
|
|
import re
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
REPLY_DATA = re.compile("<reply>[ \t\n\r]*<data[^<]*>(.*?)</data>", re.MULTILINE | re.DOTALL)
|
|
|
|
|
|
class ClosingFileHandler(logging.StreamHandler):
|
|
def __init__(self, filename):
|
|
super(ClosingFileHandler, self).__init__()
|
|
self.filename = os.path.abspath(filename)
|
|
self.setStream(None)
|
|
|
|
def emit(self, record):
|
|
with open(self.filename, "a") as fp:
|
|
self.setStream(fp)
|
|
super(ClosingFileHandler, self).emit(record)
|
|
self.setStream(None)
|
|
|
|
def setStream(self, stream):
|
|
setStream = getattr(super(ClosingFileHandler, self), 'setStream', None)
|
|
if callable(setStream):
|
|
return setStream(stream)
|
|
if stream is self.stream:
|
|
result = None
|
|
else:
|
|
result = self.stream
|
|
self.acquire()
|
|
try:
|
|
self.flush()
|
|
self.stream = stream
|
|
finally:
|
|
self.release()
|
|
return result
|
|
|
|
class TestData(object):
|
|
def __init__(self, data_folder):
|
|
self.data_folder = data_folder
|
|
|
|
def get_test_data(self, test_number):
|
|
# Create the test file name
|
|
filename = os.path.join(self.data_folder,
|
|
"test{0}".format(test_number))
|
|
|
|
log.debug("Parsing file %s", filename)
|
|
|
|
with open(filename, "r", encoding='us-ascii') as f:
|
|
contents = f.read()
|
|
|
|
m = REPLY_DATA.search(contents)
|
|
if not m:
|
|
raise Exception("Couldn't find a <reply><data> section")
|
|
|
|
# Left-strip the data so we don't get a newline before our data.
|
|
return m.group(1).lstrip()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
td = TestData("./data")
|
|
data = td.get_test_data(1451)
|
|
print(data)
|