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
c1a43a29
Commit
c1a43a29
authored
4 years ago
by
Chris Lamb
Browse files
Options
Downloads
Patches
Plain Diff
Move to assert_diff in test_apk.
parent
e70171a7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#229823
failed
4 years ago
Stage: test
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/comparators/test_apk.py
+3
-5
3 additions, 5 deletions
tests/comparators/test_apk.py
with
3 additions
and
5 deletions
tests/comparators/test_apk.py
+
3
−
5
View file @
c1a43a29
...
...
@@ -23,7 +23,7 @@ import subprocess
from
diffoscope.comparators.apk
import
ApkFile
from
..utils.data
import
load_fixture
,
get_data
from
..utils.data
import
load_fixture
,
assert_diff
from
..utils.tools
import
skip_unless_tools_exist
,
skip_unless_tool_is_at_least
from
..utils.nonexisting
import
assert_non_existing
...
...
@@ -68,8 +68,7 @@ def test_compare_non_existing(monkeypatch, apk1):
def
test_zipinfo
(
differences
):
assert
differences
[
0
].
source1
==
"
zipinfo {}
"
assert
differences
[
0
].
source2
==
"
zipinfo {}
"
expected_diff
=
get_data
(
"
apk_zipinfo_expected_diff
"
)
assert
differences
[
0
].
unified_diff
==
expected_diff
assert_diff
(
differences
[
0
],
"
apk_zipinfo_expected_diff
"
)
@skip_unless_tools_exist
(
"
zipinfo
"
)
...
...
@@ -80,8 +79,7 @@ def test_zipinfo(differences):
def
test_android_manifest
(
differences
):
assert
differences
[
1
].
source1
==
"
AndroidManifest.xml (decoded)
"
assert
differences
[
1
].
source2
==
"
AndroidManifest.xml (decoded)
"
expected_diff
=
get_data
(
"
apk_manifest_expected_diff
"
)
assert
differences
[
1
].
details
[
0
].
unified_diff
==
expected_diff
assert_diff
(
differences
[
1
].
details
[
0
],
"
apk_manifest_expected_diff
"
)
@skip_unless_tools_exist
(
"
apktool
"
,
"
zipinfo
"
)
...
...
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