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
037bdcbb
Commit
037bdcbb
authored
10 months ago
by
Chris Lamb
Browse files
Options
Downloads
Patches
Plain Diff
Factor out version detection in test_jpeg_image. (Re:
#384
)
parent
82bbacbf
No related branches found
No related tags found
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/comparators/test_jpeg_image.py
+5
-3
5 additions, 3 deletions
tests/comparators/test_jpeg_image.py
with
5 additions
and
3 deletions
tests/comparators/test_jpeg_image.py
+
5
−
3
View file @
037bdcbb
...
...
@@ -33,8 +33,8 @@ image1_meta = load_fixture("test1_meta.jpg")
image2_meta
=
load_fixture
(
"
test2_meta.jpg
"
)
def
i
dentify
_version
():
out
=
subprocess
.
check_output
([
"
identify
"
,
"
-version
"
]).
decode
(
"
utf-8
"
)
def
i
magemagick
_version
(
command
):
out
=
subprocess
.
check_output
([
command
,
"
-version
"
]).
decode
(
"
utf-8
"
)
# First line is expected to look like
# "Version: ImageMagick 6.9.6-6 Q16 x86_64 20161125 ..."
if
not
out
.
startswith
(
"
Version: ImageMagick
"
):
...
...
@@ -75,7 +75,9 @@ def differences_meta(image1_meta, image2_meta):
@skip_unless_tools_exist
(
"
img2txt
"
,
"
identify
"
)
@skip_unless_tool_is_between
(
"
identify
"
,
identify_version
,
"
6.9.6
"
,
"
7.0.0
"
)
@skip_unless_tool_is_between
(
"
identify
"
,
lambda
:
imagemagick_version
(
"
identify
"
),
"
6.9.6
"
,
"
7.0.0
"
)
def
test_diff_meta
(
differences_meta
):
assert_diff
(
differences_meta
[
-
1
],
"
jpeg_image_meta_expected_diff
"
)
...
...
This diff is collapsed.
Click to expand it.
Chris Lamb
@lamby
mentioned in commit
38f76379
·
10 months ago
mentioned in commit
38f76379
mentioned in commit 38f76379bb88fa64bf547f2aaf8f032a8771a4ba
Toggle commit list
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