[diffoscope] 03/04: Rename tests/comparators/conftest.py -> tests/comparators/utils.py.

Chris Lamb chris at chris-lamb.co.uk
Sat Aug 20 21:29:54 CEST 2016


This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository diffoscope.

commit ac8ac6e6796036084c045bf82ffc75b3fef5ae64
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Aug 20 19:38:44 2016 +0100

    Rename tests/comparators/conftest.py -> tests/comparators/utils.py.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 tests/comparators/test_binary.py            | 2 +-
 tests/comparators/test_bzip2.py             | 2 +-
 tests/comparators/test_cbfs.py              | 2 +-
 tests/comparators/test_cpio.py              | 2 +-
 tests/comparators/test_deb.py               | 2 +-
 tests/comparators/test_debian.py            | 2 +-
 tests/comparators/test_dex.py               | 2 +-
 tests/comparators/test_directory.py         | 2 +-
 tests/comparators/test_elf.py               | 2 +-
 tests/comparators/test_epub.py              | 2 +-
 tests/comparators/test_fonts.py             | 2 +-
 tests/comparators/test_fsimage.py           | 2 +-
 tests/comparators/test_gettext.py           | 2 +-
 tests/comparators/test_git.py               | 2 +-
 tests/comparators/test_gzip.py              | 2 +-
 tests/comparators/test_haskell.py           | 2 +-
 tests/comparators/test_icc.py               | 2 +-
 tests/comparators/test_image.py             | 2 +-
 tests/comparators/test_ipk.py               | 2 +-
 tests/comparators/test_iso9660.py           | 2 +-
 tests/comparators/test_java.py              | 2 +-
 tests/comparators/test_json.py              | 2 +-
 tests/comparators/test_macho.py             | 2 +-
 tests/comparators/test_mono.py              | 2 +-
 tests/comparators/test_pdf.py               | 2 +-
 tests/comparators/test_png.py               | 2 +-
 tests/comparators/test_ppu.py               | 2 +-
 tests/comparators/test_ps.py                | 2 +-
 tests/comparators/test_rlib.py              | 2 +-
 tests/comparators/test_rpm.py               | 2 +-
 tests/comparators/test_sqlite.py            | 2 +-
 tests/comparators/test_squashfs.py          | 2 +-
 tests/comparators/test_tar.py               | 2 +-
 tests/comparators/test_text.py              | 2 +-
 tests/comparators/test_utils.py             | 2 +-
 tests/comparators/test_xz.py                | 2 +-
 tests/comparators/test_zip.py               | 2 +-
 tests/comparators/{conftest.py => utils.py} | 0
 38 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/tests/comparators/test_binary.py b/tests/comparators/test_binary.py
index 8e51ede..401de7e 100644
--- a/tests/comparators/test_binary.py
+++ b/tests/comparators/test_binary.py
@@ -28,7 +28,7 @@ from diffoscope.difference import Difference
 from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import File, FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('binary1')
 TEST_FILE2_PATH = data('binary2')
diff --git a/tests/comparators/test_bzip2.py b/tests/comparators/test_bzip2.py
index ad53a0a..144afed 100644
--- a/tests/comparators/test_bzip2.py
+++ b/tests/comparators/test_bzip2.py
@@ -25,7 +25,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 from diffoscope.comparators.bzip2 import Bzip2File
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.bz2')
 TEST_FILE2_PATH = data('test2.bz2')
diff --git a/tests/comparators/test_cbfs.py b/tests/comparators/test_cbfs.py
index f27cdaf..4ec06b2 100644
--- a/tests/comparators/test_cbfs.py
+++ b/tests/comparators/test_cbfs.py
@@ -27,7 +27,7 @@ from diffoscope.presenters.text import output_text
 from diffoscope.comparators.cbfs import CbfsFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('text_ascii1')
 TEST_FILE2_PATH = data('text_ascii2')
diff --git a/tests/comparators/test_cpio.py b/tests/comparators/test_cpio.py
index dfcb977..435de58 100644
--- a/tests/comparators/test_cpio.py
+++ b/tests/comparators/test_cpio.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.cpio import CpioFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.cpio')
 TEST_FILE2_PATH = data('test2.cpio')
diff --git a/tests/comparators/test_deb.py b/tests/comparators/test_deb.py
index b8b389c..cdf8caa 100644
--- a/tests/comparators/test_deb.py
+++ b/tests/comparators/test_deb.py
@@ -26,7 +26,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.deb import DebFile, Md5sumsFile, DebDataTarFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import data
+from utils import data
 
 TEST_FILE1_PATH = data('test1.deb')
 TEST_FILE2_PATH = data('test2.deb')
diff --git a/tests/comparators/test_debian.py b/tests/comparators/test_debian.py
index 65c1d35..acb9868 100644
--- a/tests/comparators/test_debian.py
+++ b/tests/comparators/test_debian.py
@@ -25,7 +25,7 @@ from diffoscope.comparators import specialize
 from diffoscope.presenters.text import output_text
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import data
+from utils import data
 
 try:
     from diffoscope.comparators.debian import DotChangesFile, DotDscFile, \
diff --git a/tests/comparators/test_dex.py b/tests/comparators/test_dex.py
index ede2fff..03cc4cf 100644
--- a/tests/comparators/test_dex.py
+++ b/tests/comparators/test_dex.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.dex import DexFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.dex')
 TEST_FILE2_PATH = data('test2.dex')
diff --git a/tests/comparators/test_directory.py b/tests/comparators/test_directory.py
index c3c9071..cd87162 100644
--- a/tests/comparators/test_directory.py
+++ b/tests/comparators/test_directory.py
@@ -24,7 +24,7 @@ import pytest
 from diffoscope.presenters.text import output_text
 from diffoscope.comparators.directory import compare_directories
 
-from conftest import data
+from utils import data
 
 TEST_FILE1_PATH = data('text_ascii1')
 TEST_FILE2_PATH = data('text_ascii2')
diff --git a/tests/comparators/test_elf.py b/tests/comparators/test_elf.py
index 2fccff0..24ab904 100644
--- a/tests/comparators/test_elf.py
+++ b/tests/comparators/test_elf.py
@@ -27,7 +27,7 @@ from diffoscope.comparators.elf import ElfFile, StaticLibFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 from diffoscope.comparators.directory import FilesystemDirectory
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 try:
     import diffoscope.comparators.debian # noqa
diff --git a/tests/comparators/test_epub.py b/tests/comparators/test_epub.py
index 091683c..a680703 100644
--- a/tests/comparators/test_epub.py
+++ b/tests/comparators/test_epub.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.zip import ZipFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.epub')
 TEST_FILE2_PATH = data('test2.epub')
diff --git a/tests/comparators/test_fonts.py b/tests/comparators/test_fonts.py
index eb89123..33cf2c4 100644
--- a/tests/comparators/test_fonts.py
+++ b/tests/comparators/test_fonts.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.fonts import TtfFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('Samyak-Malayalam1.ttf')
 TEST_FILE2_PATH = data('Samyak-Malayalam2.ttf')
diff --git a/tests/comparators/test_fsimage.py b/tests/comparators/test_fsimage.py
index 65ceeb8..391a698 100644
--- a/tests/comparators/test_fsimage.py
+++ b/tests/comparators/test_fsimage.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 from diffoscope.comparators.fsimage import FsImageFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 try:
     import guestfs
diff --git a/tests/comparators/test_gettext.py b/tests/comparators/test_gettext.py
index d54aa90..ba1ca99 100644
--- a/tests/comparators/test_gettext.py
+++ b/tests/comparators/test_gettext.py
@@ -25,7 +25,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 from diffoscope.comparators.gettext import MoFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.mo')
 TEST_FILE2_PATH = data('test2.mo')
diff --git a/tests/comparators/test_git.py b/tests/comparators/test_git.py
index b4c3bc7..cfb5853 100644
--- a/tests/comparators/test_git.py
+++ b/tests/comparators/test_git.py
@@ -23,7 +23,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.git import GitIndexFile
 from diffoscope.comparators.binary import FilesystemFile
 
-from conftest import data
+from utils import data
 
 TEST_FILE1_PATH = data('test1.git-index')
 TEST_FILE2_PATH = data('test2.git-index')
diff --git a/tests/comparators/test_gzip.py b/tests/comparators/test_gzip.py
index 8fe70a9..323f25e 100644
--- a/tests/comparators/test_gzip.py
+++ b/tests/comparators/test_gzip.py
@@ -25,7 +25,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.gzip import GzipFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import data
+from utils import data
 
 TEST_FILE1_PATH = data('test1.gz')
 TEST_FILE2_PATH = data('test2.gz')
diff --git a/tests/comparators/test_haskell.py b/tests/comparators/test_haskell.py
index 6c42a46..0a6ecbf 100644
--- a/tests/comparators/test_haskell.py
+++ b/tests/comparators/test_haskell.py
@@ -23,7 +23,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.haskell import HiFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.hi')
 TEST_FILE2_PATH = data('test2.hi')
diff --git a/tests/comparators/test_icc.py b/tests/comparators/test_icc.py
index 53c007a..6b0c7ae 100644
--- a/tests/comparators/test_icc.py
+++ b/tests/comparators/test_icc.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.icc import IccFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.icc')
 TEST_FILE2_PATH = data('test2.icc')
diff --git a/tests/comparators/test_image.py b/tests/comparators/test_image.py
index 0ff2f63..273ac7c 100644
--- a/tests/comparators/test_image.py
+++ b/tests/comparators/test_image.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.image import ImageFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.jpg')
 TEST_FILE2_PATH = data('test2.jpg')
diff --git a/tests/comparators/test_ipk.py b/tests/comparators/test_ipk.py
index da0f3f1..959a27f 100644
--- a/tests/comparators/test_ipk.py
+++ b/tests/comparators/test_ipk.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.ipk import IpkFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import data
+from utils import data
 
 TEST_FILE1_PATH = data('base-files_157-r45695_ar71xx.ipk')
 TEST_FILE2_PATH = data('base-files_157-r45918_ar71xx.ipk')
diff --git a/tests/comparators/test_iso9660.py b/tests/comparators/test_iso9660.py
index 54bbfcd..7ab4953 100644
--- a/tests/comparators/test_iso9660.py
+++ b/tests/comparators/test_iso9660.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 from diffoscope.comparators.iso9660 import Iso9660File
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.iso')
 TEST_FILE2_PATH = data('test2.iso')
diff --git a/tests/comparators/test_java.py b/tests/comparators/test_java.py
index 1ead8c9..bd8337e 100644
--- a/tests/comparators/test_java.py
+++ b/tests/comparators/test_java.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.java import ClassFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('Test1.class')
 TEST_FILE2_PATH = data('Test2.class')
diff --git a/tests/comparators/test_json.py b/tests/comparators/test_json.py
index 80adaf9..5a72995 100644
--- a/tests/comparators/test_json.py
+++ b/tests/comparators/test_json.py
@@ -23,7 +23,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.json import JSONFile
 from diffoscope.comparators.binary import FilesystemFile
 
-from conftest import data
+from utils import data
 
 TEST_FILE1_PATH = data('test1.json')
 TEST_FILE2_PATH = data('test2.json')
diff --git a/tests/comparators/test_macho.py b/tests/comparators/test_macho.py
index 1315145..6c7c6e8 100644
--- a/tests/comparators/test_macho.py
+++ b/tests/comparators/test_macho.py
@@ -26,7 +26,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.macho import MachoFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_OBJ1_PATH = data('test1.macho')
 TEST_OBJ2_PATH = data('test2.macho')
diff --git a/tests/comparators/test_mono.py b/tests/comparators/test_mono.py
index ba42cbd..b3423a5 100644
--- a/tests/comparators/test_mono.py
+++ b/tests/comparators/test_mono.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.mono import MonoExeFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 # these were generated with:
 
diff --git a/tests/comparators/test_pdf.py b/tests/comparators/test_pdf.py
index c9e69e2..d3795f9 100644
--- a/tests/comparators/test_pdf.py
+++ b/tests/comparators/test_pdf.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.pdf import PdfFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.pdf')
 TEST_FILE2_PATH = data('test2.pdf')
diff --git a/tests/comparators/test_png.py b/tests/comparators/test_png.py
index a03a36f..d5d3d65 100644
--- a/tests/comparators/test_png.py
+++ b/tests/comparators/test_png.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.png import PngFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.png')
 TEST_FILE2_PATH = data('test2.png')
diff --git a/tests/comparators/test_ppu.py b/tests/comparators/test_ppu.py
index dd5d27d..4296ea1 100644
--- a/tests/comparators/test_ppu.py
+++ b/tests/comparators/test_ppu.py
@@ -25,7 +25,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.ppu import PpuFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 # These test files were taken from two different builds of the Debian package
 # fp-units-castle-game-engine (version 5.1.1-2 on amd64) on the Debian
diff --git a/tests/comparators/test_ps.py b/tests/comparators/test_ps.py
index 8e02723..2a34a08 100644
--- a/tests/comparators/test_ps.py
+++ b/tests/comparators/test_ps.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.ps import PsFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.ps')
 TEST_FILE2_PATH = data('test2.ps')
diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py
index 3d1d854..b896505 100644
--- a/tests/comparators/test_rlib.py
+++ b/tests/comparators/test_rlib.py
@@ -26,7 +26,7 @@ from diffoscope.comparators.ar import ArFile
 from diffoscope.comparators.utils import diff_ignore_line_numbers
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, tool_older_than, data
+from utils import skip_unless_tool_exists, tool_older_than, data
 
 TEST_FILE1_PATH = data('test1.rlib')
 TEST_FILE2_PATH = data('test2.rlib')
diff --git a/tests/comparators/test_rpm.py b/tests/comparators/test_rpm.py
index dec79d0..f851370 100644
--- a/tests/comparators/test_rpm.py
+++ b/tests/comparators/test_rpm.py
@@ -23,7 +23,7 @@ from diffoscope.config import Config
 from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 try:
     from diffoscope.comparators.rpm import RpmFile
diff --git a/tests/comparators/test_sqlite.py b/tests/comparators/test_sqlite.py
index 30602ea..0e39533 100644
--- a/tests/comparators/test_sqlite.py
+++ b/tests/comparators/test_sqlite.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 from diffoscope.comparators.sqlite import Sqlite3Database
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.sqlite3')
 TEST_FILE2_PATH = data('test2.sqlite3')
diff --git a/tests/comparators/test_squashfs.py b/tests/comparators/test_squashfs.py
index 87e8119..8ba994e 100644
--- a/tests/comparators/test_squashfs.py
+++ b/tests/comparators/test_squashfs.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 from diffoscope.comparators.squashfs import SquashfsFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.squashfs')
 TEST_FILE2_PATH = data('test2.squashfs')
diff --git a/tests/comparators/test_tar.py b/tests/comparators/test_tar.py
index 283c3e6..6731110 100644
--- a/tests/comparators/test_tar.py
+++ b/tests/comparators/test_tar.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.tar import TarFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import data
+from utils import data
 
 TEST_FILE1_PATH = data('test1.tar')
 TEST_FILE2_PATH = data('test2.tar')
diff --git a/tests/comparators/test_text.py b/tests/comparators/test_text.py
index f2cf394..41ddbfc 100644
--- a/tests/comparators/test_text.py
+++ b/tests/comparators/test_text.py
@@ -24,7 +24,7 @@ from diffoscope.config import Config
 from diffoscope.comparators import specialize
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import data
+from utils import data
 
 @pytest.fixture
 def ascii1():
diff --git a/tests/comparators/test_utils.py b/tests/comparators/test_utils.py
index bda40e2..5e91c6e 100644
--- a/tests/comparators/test_utils.py
+++ b/tests/comparators/test_utils.py
@@ -26,7 +26,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.utils import Command
 from diffoscope.comparators.binary import FilesystemFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 try:
     import tlsh # noqa
diff --git a/tests/comparators/test_xz.py b/tests/comparators/test_xz.py
index e229bba..713bed3 100644
--- a/tests/comparators/test_xz.py
+++ b/tests/comparators/test_xz.py
@@ -25,7 +25,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.xz import XzFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.xz')
 TEST_FILE2_PATH = data('test2.xz')
diff --git a/tests/comparators/test_zip.py b/tests/comparators/test_zip.py
index 2dfba82..e1d5d5e 100644
--- a/tests/comparators/test_zip.py
+++ b/tests/comparators/test_zip.py
@@ -24,7 +24,7 @@ from diffoscope.comparators import specialize
 from diffoscope.comparators.zip import ZipFile, MozillaZipFile
 from diffoscope.comparators.binary import FilesystemFile, NonExistingFile
 
-from conftest import skip_unless_tool_exists, data
+from utils import skip_unless_tool_exists, data
 
 TEST_FILE1_PATH = data('test1.zip')
 TEST_FILE2_PATH = data('test2.zip')
diff --git a/tests/comparators/conftest.py b/tests/comparators/utils.py
similarity index 100%
rename from tests/comparators/conftest.py
rename to tests/comparators/utils.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git


More information about the diffoscope mailing list