* testenv/conf/expected_files.py: Aesthetic changes only. Format file with black

This commit is contained in:
Darshit Shah
2024-02-19 17:49:14 +05:30
parent 642e740182
commit dfb9f65fc3

View File

@ -23,18 +23,24 @@ class ExpectedFiles:
@staticmethod @staticmethod
def gen_local_fs_snapshot(): def gen_local_fs_snapshot():
snapshot = {} snapshot = {}
for parent, dirs, files in os.walk('.'): for parent, dirs, files in os.walk("."):
for name in files: for name in files:
# pubring.gpg, pubring.kbx, common.conf, dirmngr.conf, gpg.conf will be created by libgpgme # pubring.gpg, pubring.kbx, common.conf, dirmngr.conf, gpg.conf will be created by libgpgme
# if $HOME doesn't contain the .gnupg directory. # if $HOME doesn't contain the .gnupg directory.
# setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here. # setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here.
if name in [ 'pubring.gpg', 'pubring.kbx', 'common.conf', 'dirmngr.conf', 'gpg.conf' ]: if name in [
"pubring.gpg",
"pubring.kbx",
"common.conf",
"dirmngr.conf",
"gpg.conf",
]:
continue continue
f = {'content': ''} f = {"content": ""}
file_path = os.path.join(parent, name) file_path = os.path.join(parent, name)
with open(file_path) as fp: with open(file_path) as fp:
f['content'] = fp.read() f["content"] = fp.read()
snapshot[file_path[2:]] = f snapshot[file_path[2:]] = f
return snapshot return snapshot
@ -45,16 +51,19 @@ class ExpectedFiles:
if file.name in local_fs: if file.name in local_fs:
local_file = local_fs.pop(file.name) local_file = local_fs.pop(file.name)
formatted_content = test_obj._replace_substring(file.content) formatted_content = test_obj._replace_substring(file.content)
if formatted_content != local_file['content']: if formatted_content != local_file["content"]:
diff = ''.join(unified_diff(local_file['content'].splitlines(1), diff = "".join(
formatted_content.splitlines(1), unified_diff(
fromfile="Actual", local_file["content"].splitlines(1),
tofile="Expected") formatted_content.splitlines(1),
) fromfile="Actual",
tofile="Expected",
)
)
print(diff, file=sys.stderr) print(diff, file=sys.stderr)
raise TestFailed('Contents of %s do not match' % file.name) raise TestFailed("Contents of %s do not match" % file.name)
else: else:
raise TestFailed('Expected file %s not found.' % file.name) raise TestFailed("Expected file %s not found." % file.name)
if local_fs: if local_fs:
print(local_fs) print(local_fs)
raise TestFailed('Extra files downloaded.') raise TestFailed("Extra files downloaded.")