Commit 3b6050bf authored by Chris Lamb's avatar Chris Lamb 💬

Fix and add test for meaningless "1234-content" metadata when introspecting...

Fix and add test for meaningless "1234-content" metadata when introspecting files within archives. This was a regression since #854723 due to the use of auto-incrementing on-disk filenames. (Closes: #858223)
Signed-off-by: Chris Lamb's avatarChris Lamb <lamby@debian.org>
parent 96708b82
......@@ -72,7 +72,7 @@ class Archive(Container, metaclass=abc.ABCMeta):
return ArchiveMember(self, member_name)
def get_compressed_content_name(self, expected_extension):
basename = os.path.basename(self.source.path)
basename = os.path.basename(self.source.name)
if not basename.endswith(expected_extension):
return "%s-content" % basename
......
# -*- coding: utf-8 -*-
#
# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2017 Chris Lamb <lamby@debian.org>
#
# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
import pytest
from utils.data import load_fixture
archive1 = load_fixture('archive1.tar')
archive2 = load_fixture('archive2.tar')
@pytest.fixture
def differences(archive1, archive2):
return archive1.compare(archive2).details
def test_compressed_content_name(differences):
assert differences[1].details[1].source1 == 'compressed'
assert differences[1].details[1].source2 == 'compressed'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment