Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
diffoscope
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reproducible Builds
diffoscope
Commits
99afaf60
Commit
99afaf60
authored
1 year ago
by
Chris Lamb
Browse files
Options
Downloads
Patches
Plain Diff
Avoid parens-in-parens in test skipping messages.
parent
e52eef5a
No related branches found
No related tags found
No related merge requests found
Pipeline
#665907
failed
1 year ago
Stage: test
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/utils/tools.py
+4
-4
4 additions, 4 deletions
tests/utils/tools.py
with
4 additions
and
4 deletions
tests/utils/tools.py
+
4
−
4
View file @
99afaf60
...
...
@@ -111,7 +111,7 @@ def skip_if_tool_version_is(tool, actual_ver, target_ver, vcls=Version):
actual_ver
=
actual_ver
()
return
skipif
(
vcls
(
str
(
actual_ver
))
==
vcls
(
str
(
target_ver
)),
reason
=
"
requires {} != {}
(
{} detected
)
"
.
format
(
reason
=
"
requires {} != {}
;
{} detected
"
.
format
(
tool
,
target_ver
,
actual_ver
),
tools
=
(
tool
,),
...
...
@@ -125,7 +125,7 @@ def skip_unless_tool_is_at_least(tool, actual_ver, min_ver, vcls=Version):
actual_ver
=
actual_ver
()
return
skipif
(
vcls
(
str
(
actual_ver
))
<
vcls
(
str
(
min_ver
)),
reason
=
"
{} >= {}
(
{} detected
)
"
.
format
(
reason
=
"
{} >= {}
;
{} detected
"
.
format
(
reason
(
tool
,
force_include
=
True
),
min_ver
,
actual_ver
),
tools
=
(
tool
,),
...
...
@@ -139,7 +139,7 @@ def skip_unless_tool_is_at_most(tool, actual_ver, max_ver, vcls=Version):
actual_ver
=
actual_ver
()
return
skipif
(
vcls
(
str
(
actual_ver
))
>
vcls
(
str
(
max_ver
)),
reason
=
"
{} <= {}
(
{} detected
)
"
.
format
(
reason
=
"
{} <= {}
;
{} detected
"
.
format
(
reason
(
tool
,
force_include
=
True
),
max_ver
,
actual_ver
),
tools
=
(
tool
,),
...
...
@@ -156,7 +156,7 @@ def skip_unless_tool_is_between(
return
skipif
(
(
vcls
(
str
(
actual_ver
))
<
vcls
(
str
(
min_ver
)))
or
(
vcls
(
str
(
actual_ver
))
>
vcls
(
str
(
max_ver
))),
reason
=
"
{} min {} >= {}
(
{} detected
)
"
.
format
(
reason
=
"
{} min {} >= {}
;
{} detected
"
.
format
(
reason
(
tool
,
force_include
=
True
),
min_ver
,
max_ver
,
actual_ver
),
tools
=
(
tool
,),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment