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
52919364
"p/haskell-failure/merge_requests" did not exist on "master"
Commit
52919364
authored
1 year ago
by
Chris Lamb
Browse files
Options
Downloads
Patches
Plain Diff
Only include xz --list --verbose output if the xz has no other differences.
parent
9a7d78f0
No related branches found
No related tags found
No related merge requests found
Pipeline
#677914
failed
1 year ago
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
diffoscope/comparators/xz.py
+1
-1
1 addition, 1 deletion
diffoscope/comparators/xz.py
tests/comparators/test_xz.py
+0
-5
0 additions, 5 deletions
tests/comparators/test_xz.py
with
1 addition
and
6 deletions
diffoscope/comparators/xz.py
+
1
−
1
View file @
52919364
...
...
@@ -80,7 +80,7 @@ class XzFile(File):
difference
=
super
().
compare
(
other
,
source
)
# Append xz --list *after* showing any container differences.
if
isinstance
(
other
,
XzFile
):
if
difference
and
not
difference
.
details
and
isinstance
(
other
,
XzFile
):
xz_list
=
Difference
.
from_operation
(
XZList
,
self
.
path
,
other
.
path
,
source
=
"
xz --list
"
)
...
...
This diff is collapsed.
Click to expand it.
tests/comparators/test_xz.py
+
0
−
5
View file @
52919364
...
...
@@ -52,8 +52,6 @@ def differences(xz1, xz2):
def
test_content_source
(
differences
):
assert
differences
[
0
].
source1
==
"
test1
"
assert
differences
[
0
].
source2
==
"
test2
"
assert
differences
[
1
].
source1
==
"
xz --list
"
assert
differences
[
1
].
source2
==
"
xz --list
"
@skip_unless_tools_exist
(
"
xz
"
)
...
...
@@ -67,14 +65,11 @@ def test_content_source_without_extension(tmpdir, xz1, xz2):
difference
=
xz1
.
compare
(
xz2
).
details
assert
difference
[
0
].
source1
==
"
test1-content
"
assert
difference
[
0
].
source2
==
"
test2-content
"
assert
difference
[
1
].
source1
==
"
xz --list
"
assert
difference
[
1
].
source2
==
"
xz --list
"
@skip_unless_tools_exist
(
"
xz
"
)
def
test_content_diff
(
differences
):
assert_diff
(
differences
[
0
],
"
text_ascii_expected_diff
"
)
assert_diff
(
differences
[
1
],
"
text_xz_list
"
)
@skip_unless_tools_exist
(
"
xz
"
)
...
...
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