Commit f800b207 authored by Chris Lamb's avatar Chris Lamb 👀
Browse files

Update tests to prevent FTBFS under file 5.33, although this does not solve... 

Update tests to prevent FTBFS under file 5.33, although this does not solve the Berkeley DB tests (see. #897153) (Closes: #897099)
parent 82c75b02

tests/comparators/test_containers.py

+5 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import pytest 
import itertools



from ..utils.data import load_fixture, get_data

from ..utils.tools import skip_unless_tools_exist

from ..utils.tools import skip_unless_tools_exist, skip_unless_file_version_is_at_least



gzip1 = load_fixture('containers/a.tar.gz')

gzip2 = load_fixture('containers/b.tar.gz')
@@ -53,6 +53,7 @@ def expected_type_diff(ext1, ext2): 


# Compares same content files, but with different extensions

@skip_unless_tools_exist('xz')

@skip_unless_file_version_is_at_least('5.33')

def test_equal(set1):

    for x, y in itertools.product(TYPES, TYPES):

        diff = set1[x].compare(set1[y])
@@ -60,11 +61,12 @@ def test_equal(set1): 
            assert diff is None

        else:

            differences = diff.details

            assert differences[0].unified_diff == expected_magic_diff(x, y)

            assert differences[0].unified_diff == expected_magic_diff(x, y), "{} {}".format(x, y)

            assert differences[1].unified_diff == expected_type_diff(x, y)



# Compares different content files with different extensions

@skip_unless_tools_exist('xz')

@skip_unless_file_version_is_at_least('5.33')

def test_different(set1, set2):

    for x, y in itertools.product(TYPES, TYPES):

        expected_diff = get_data('containers/different_files_expected_diff')
@@ -72,6 +74,6 @@ def test_different(set1, set2): 
        if x == y:

            assert differences[0].details[1].unified_diff == expected_diff

        else:

            assert differences[0].unified_diff == expected_magic_diff(x, y)

            assert differences[0].unified_diff == expected_magic_diff(x, y), "{} {}".format(x, y)

            assert differences[1].unified_diff == expected_type_diff(x, y)

            assert differences[2].details[1].unified_diff == expected_diff

tests/comparators/test_gzip.py

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ from diffoscope.comparators.missing_file import MissingFile 
from diffoscope.comparators.utils.specialize import specialize, is_direct_instance



from ..utils.data import load_fixture, get_data

from ..utils.tools import skip_unless_file_version_is_at_least





gzip1 = load_fixture('test1.gz')
@@ -56,6 +57,7 @@ def differences(gzip1, gzip2): 
    return gzip1.compare(gzip2).details





@skip_unless_file_version_is_at_least('5.33')

def test_metadata(differences):

    assert differences[0].source1.startswith('filetype')

    assert differences[0].source2.startswith('filetype')

tests/comparators/test_ipk.py

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ from diffoscope.comparators.ipk import IpkFile 
from diffoscope.comparators.missing_file import MissingFile



from ..utils.data import load_fixture, get_data

from ..utils.tools import skip_unless_file_version_is_at_least





ipk1 = load_fixture('base-files_157-r45695_ar71xx.ipk')
@@ -44,6 +45,7 @@ def differences(ipk1, ipk2): 
    return ipk1.compare(ipk2).details





@skip_unless_file_version_is_at_least('5.33')

def test_metadata(differences):

    assert differences[0].source1.startswith('filetype')

    expected_diff = get_data('ipk_metadata_expected_diff')

tests/data/archive12.diff.txt

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
├── compressed.gz

│ ├── filetype from file(1)

│ │ @@ -1 +1 @@

│ │ -gzip compressed data, max compression, from Unix

│ │ +gzip compressed data, was "compressed", last modified: Sun Mar 19 22:27:42 2017, max compression, from Unix

│ │ -gzip compressed data, max compression, from Unix, original size 2

│ │ +gzip compressed data, was "compressed", last modified: Sun Mar 19 22:27:42 2017, max compression, from Unix, original size 2

│ ├── compressed

│ │ @@ -1 +1 @@

│ │ -a

tests/data/containers/magic_gzip

+1 −1
Original line number Diff line number Diff line 
gzip compressed data, last modified: Sun Sep 10 22:19:44 2017, from Unix
 
gzip compressed data, last modified: Sun Sep 10 22:19:44 2017, from Unix, original size 10240