Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
diffoscope
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
37
Issues
37
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Reproducible Builds
diffoscope
Commits
6a72ff40
Commit
6a72ff40
authored
Sep 16, 2017
by
Chris Lamb
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test.comparators.test_containers: Flake8 file.
parent
7ca74d2d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
1 deletion
+15
-1
tests/comparators/test_containers.py
tests/comparators/test_containers.py
+15
-1
No files found.
tests/comparators/test_containers.py
View file @
6a72ff40
...
...
@@ -17,7 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
import
shutil
import
pytest
from
..utils.data
import
load_fixture
,
get_data
...
...
@@ -31,65 +30,80 @@ xz2 = load_fixture('containers/b.tar.xz')
bzip1
=
load_fixture
(
'containers/a.tar.bz2'
)
bzip2
=
load_fixture
(
'containers/b.tar.bz2'
)
@
pytest
.
fixture
def
differences_equal_gzip_xz
(
gzip1
,
xz1
):
return
gzip1
.
compare
(
xz1
)
.
details
@
pytest
.
fixture
def
differences_equal_gzip_bzip2
(
gzip1
,
bzip1
):
return
gzip1
.
compare
(
bzip1
)
.
details
@
pytest
.
fixture
def
differences_equal_bzip2_xz
(
bzip1
,
xz1
):
return
bzip1
.
compare
(
xz1
)
.
details
@
pytest
.
fixture
def
differences_different_gzip_xz
(
gzip1
,
xz2
):
return
gzip1
.
compare
(
xz2
)
.
details
@
pytest
.
fixture
def
differences_different_gzip_bzip2
(
gzip1
,
bzip2
):
return
gzip1
.
compare
(
bzip2
)
.
details
@
pytest
.
fixture
def
differences_different_bzip2_xz
(
bzip1
,
xz2
):
return
bzip1
.
compare
(
xz2
)
.
details
# Compares same content files, but with different extensions
def
test_equal_content_gzip_xz_diff
(
differences_equal_gzip_xz
):
expected_diff
=
get_data
(
'containers/equal_files_expected_bzip_xz_diff'
)
assert
differences_equal_gzip_xz
[
0
]
.
unified_diff
==
expected_diff
def
test_equal_content_gzip_bzip2_diff
(
differences_equal_gzip_bzip2
):
expected_diff
=
get_data
(
'containers/equal_files_expected_gzip_bzip2_diff'
)
assert
differences_equal_gzip_bzip2
[
0
]
.
unified_diff
==
expected_diff
@
pytest
.
mark
.
skip
(
reason
=
"Behavior not matching previous containers. Check needed."
)
def
test_equal_content_bzip2_xz_diff
(
differences_equal_bzip2_xz
):
assert
differences_equal_bzip2_xz
==
[]
# Compares different content files with different extensions
def
test_different_content_gzip_xz_meta
(
differences_different_gzip_xz
):
expected_diff
=
get_data
(
'containers/different_files_expected_gzip_xz_meta'
)
assert
differences_different_gzip_xz
[
0
]
.
unified_diff
==
expected_diff
def
test_different_content_gzip_xz_diff
(
differences_different_gzip_xz
):
expected_diff
=
get_data
(
'containers/different_files_expected_gzip_xz_diff'
)
assert
differences_different_gzip_xz
[
1
]
.
details
[
1
]
.
unified_diff
==
expected_diff
def
test_different_content_gzip_bzip2_meta
(
differences_different_gzip_bzip2
):
expected_diff
=
get_data
(
'containers/different_files_expected_gzip_bzip2_meta'
)
assert
differences_different_gzip_bzip2
[
0
]
.
unified_diff
==
expected_diff
def
test_different_content_gzip_bzip2_diff
(
differences_different_gzip_bzip2
):
expected_diff
=
get_data
(
'containers/different_files_expected_gzip_bzip2_diff'
)
assert
differences_different_gzip_bzip2
[
1
]
.
details
[
1
]
.
unified_diff
==
expected_diff
@
pytest
.
mark
.
skip
(
reason
=
"Behavior not matching previous containers. Check needed."
)
def
test_different_content_bzip2_xz_meta
(
differences_different_bzip2_xz
):
expected_diff
=
get_data
(
'containers/different_files_expected_bzip2_xz_meta'
)
assert
differences_different_bzip2_xz
[
0
]
.
unified_diff
==
expected_diff
def
test_different_content_bzip2_xz_diff
(
differences_different_bzip2_xz
):
expected_diff
=
get_data
(
'containers/different_files_expected_bzip2_xz_diff'
)
assert
differences_different_bzip2_xz
[
0
]
.
details
[
1
]
.
unified_diff
==
expected_diff
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment