-
Notifications
You must be signed in to change notification settings - Fork 144
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2d458aa
commit 23ecd38
Showing
6 changed files
with
20 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -455,8 +455,7 @@ def read( | |
with open(datafile_path, encoding='utf-8') as datafile_file: | ||
datafile = datafile_file.read() | ||
except OSError: | ||
raise ConvertError("Unable to open '{}'.".format( | ||
datafile_path)) | ||
raise ConvertError(f"Unable to open '{datafile_path}'.") | ||
echo(f"found in '{datafile_path}'.") | ||
|
||
# If testinfo.desc exists read it to preserve content and remove it | ||
|
@@ -489,8 +488,7 @@ def read( | |
stdout=subprocess.DEVNULL) | ||
except FileNotFoundError: | ||
raise ConvertError( | ||
"Install tmt-test-convert to " | ||
"convert metadata from {}.".format(filename)) | ||
f"Install tmt-test-convert to convert metadata from {filename}.") | ||
except subprocess.CalledProcessError: | ||
raise ConvertError( | ||
"Failed to convert metadata using 'make testinfo.desc'.") | ||
|
@@ -500,8 +498,7 @@ def read( | |
with open(testinfo_path, encoding='utf-8') as testinfo_file: | ||
testinfo = testinfo_file.read() | ||
except OSError: | ||
raise ConvertError("Unable to open '{}'.".format( | ||
testinfo_path)) | ||
raise ConvertError(f"Unable to open '{testinfo_path}'.") | ||
|
||
# restraint | ||
if restraint_file: | ||
|
@@ -967,8 +964,7 @@ def read_nitrate_case( | |
if testcase.tester: | ||
# Full 'Name Surname <[email protected]>' form | ||
if testcase.tester.name is not None: | ||
data['contact'] = '{} <{}>'.format( | ||
testcase.tester.name, testcase.tester.email) | ||
data['contact'] = f'{testcase.tester.name} <{testcase.tester.email}>' | ||
else: | ||
if makefile_data is None or 'contact' not in makefile_data: | ||
# Otherwise use just the email address | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters