[diffoscope] 02/10: fix pep8 E305
Mattia Rizzolo
mattia at debian.org
Sat Sep 9 22:39:51 CEST 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository diffoscope.
commit f02a91c3299580d633c6d137309bad35ac66a2d5
Author: Mattia Rizzolo <mattia at debian.org>
Date: Sat Sep 9 22:06:50 2017 +0200
fix pep8 E305
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
diffoscope/diff.py | 1 +
diffoscope/main.py | 1 +
tests/comparators/test_elf.py | 2 ++
tests/comparators/test_gettext.py | 1 +
tests/comparators/test_squashfs.py | 1 +
tests/comparators/test_tar.py | 1 +
tests/comparators/test_text.py | 3 +++
tests/comparators/test_utils.py | 1 +
8 files changed, 11 insertions(+)
diff --git a/diffoscope/diff.py b/diffoscope/diff.py
index ed61a28..188302f 100644
--- a/diffoscope/diff.py
+++ b/diffoscope/diff.py
@@ -291,6 +291,7 @@ def color_unified_diff(diff):
return re_diff_change.sub(repl, diff)
+
DIFFON = "\x01"
DIFFOFF = "\x02"
MAX_WF_SIZE = 1024 # any higher, and linediff takes >1 second and >200MB RAM
diff --git a/diffoscope/main.py b/diffoscope/main.py
index da9cf53..20b93b3 100644
--- a/diffoscope/main.py
+++ b/diffoscope/main.py
@@ -415,5 +415,6 @@ def main(args=None):
if parsed_args is not None:
ProfileManager().finish(parsed_args)
+
if __name__ == '__main__':
main()
diff --git a/tests/comparators/test_elf.py b/tests/comparators/test_elf.py
index 46f1635..27c5894 100644
--- a/tests/comparators/test_elf.py
+++ b/tests/comparators/test_elf.py
@@ -60,6 +60,7 @@ def test_diff(obj_differences):
expected_diff = get_data('elf_obj_expected_diff')
assert obj_differences[0].unified_diff == expected_diff
+
TEST_LIB1_PATH = data('test1.a')
TEST_LIB2_PATH = data('test2.a')
@@ -101,6 +102,7 @@ def test_lib_compare_non_existing(monkeypatch, lib1):
assert difference.source2 == '/nonexisting'
assert len(difference.details) > 0
+
TEST_DBGSYM_DEB1_PATH = data('dbgsym/add/test-dbgsym_1_amd64.deb')
TEST_DBGSYM_DEB2_PATH = data('dbgsym/mult/test-dbgsym_1_amd64.deb')
diff --git a/tests/comparators/test_gettext.py b/tests/comparators/test_gettext.py
index 96dc815..ac0767e 100644
--- a/tests/comparators/test_gettext.py
+++ b/tests/comparators/test_gettext.py
@@ -47,6 +47,7 @@ def test_diff(differences):
expected_diff = get_data('mo_expected_diff')
assert differences[0].unified_diff == expected_diff
+
mo_no_charset = load_fixture('test_no_charset.mo')
mo_iso8859_1 = load_fixture('test_iso8859-1.mo')
diff --git a/tests/comparators/test_squashfs.py b/tests/comparators/test_squashfs.py
index 3924694..277e0c4 100644
--- a/tests/comparators/test_squashfs.py
+++ b/tests/comparators/test_squashfs.py
@@ -36,6 +36,7 @@ def unsquashfs_version():
out = e.output
return out.decode('UTF-8').splitlines()[0].split()[2].strip()
+
squashfs1 = load_fixture('test1.squashfs')
squashfs2 = load_fixture('test2.squashfs')
diff --git a/tests/comparators/test_tar.py b/tests/comparators/test_tar.py
index 08a7874..2cfd693 100644
--- a/tests/comparators/test_tar.py
+++ b/tests/comparators/test_tar.py
@@ -61,6 +61,7 @@ def test_text_file(differences):
def test_compare_non_existing(monkeypatch, tar1):
assert_non_existing(monkeypatch, tar1)
+
no_permissions_tar = load_fixture('no-perms.tar')
# Reported as Debian #797164. This is a good way to notice if we unpack directories
diff --git a/tests/comparators/test_text.py b/tests/comparators/test_text.py
index ed7bf42..67f5810 100644
--- a/tests/comparators/test_text.py
+++ b/tests/comparators/test_text.py
@@ -41,6 +41,7 @@ def test_difference_in_ascii(ascii1, ascii2):
assert not difference.comments
assert len(difference.details) == 0
+
unicode1 = load_fixture('text_unicode1')
unicode2 = load_fixture('text_unicode2')
@@ -49,6 +50,7 @@ def test_difference_in_unicode(unicode1, unicode2):
expected_diff = codecs.open(data('text_unicode_expected_diff'), encoding='utf-8').read()
assert difference.unified_diff == expected_diff
+
iso8859 = load_fixture('text_iso8859')
def test_difference_between_iso88591_and_unicode(iso8859, unicode1):
@@ -68,6 +70,7 @@ def test_difference_between_iso88591_and_unicode_only(iso8859, tmpdir):
def test_compare_non_existing(monkeypatch, ascii1):
assert_non_existing(monkeypatch, ascii1, has_null_source=False, has_details=False)
+
text_order1 = load_fixture('text_order1')
text_order2 = load_fixture('text_order2')
diff --git a/tests/comparators/test_utils.py b/tests/comparators/test_utils.py
index 71118ed..e4f132f 100644
--- a/tests/comparators/test_utils.py
+++ b/tests/comparators/test_utils.py
@@ -71,6 +71,7 @@ def test_fuzzy_matching_only_once(fuzzy_tar1, fuzzy_tar3):
differences = fuzzy_tar1.compare(fuzzy_tar3).details
assert len(differences) == 2
+
fuzzy_tar_in_tar1 = load_fixture('fuzzy-tar-in-tar1.tar')
fuzzy_tar_in_tar2 = load_fixture('fuzzy-tar-in-tar2.tar')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the diffoscope
mailing list