diff --git a/tests/test_arch.py b/tests/test_arch.py index f7670419..5dbb50fd 100644 --- a/tests/test_arch.py +++ b/tests/test_arch.py @@ -6,8 +6,6 @@ import unittest import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.arch import (get_compatible_arches, get_valid_arches, get_valid_multilib_arches, is_excluded, is_valid_arch, split_name_arch) diff --git a/tests/test_buildinstall.py b/tests/test_buildinstall.py index cf73c760..15464a1f 100644 --- a/tests/test_buildinstall.py +++ b/tests/test_buildinstall.py @@ -7,8 +7,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.buildinstall import (BuildinstallPhase, BuildinstallThread, link_boot_iso, BOOT_CONFIGS, tweak_configs) from tests.helpers import DummyCompose, PungiTestCase, touch diff --git a/tests/test_checks.py b/tests/test_checks.py index c301fdaa..024553eb 100644 --- a/tests/test_checks.py +++ b/tests/test_checks.py @@ -11,8 +11,6 @@ from six import StringIO import kobo.conf -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from pungi import checks diff --git a/tests/test_compose.py b/tests/test_compose.py index 3e29193b..18be7c6b 100644 --- a/tests/test_compose.py +++ b/tests/test_compose.py @@ -12,8 +12,6 @@ import sys import tempfile import shutil -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.compose import Compose diff --git a/tests/test_comps_wrapper.py b/tests/test_comps_wrapper.py index 76a2247d..943d73fb 100644 --- a/tests/test_comps_wrapper.py +++ b/tests/test_comps_wrapper.py @@ -9,8 +9,6 @@ import tempfile import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers.comps import CompsWrapper, CompsFilter, CompsValidationError from tests.helpers import BaseTestCase, FIXTURE_DIR diff --git a/tests/test_config.py b/tests/test_config.py index ddbe2940..e34640b9 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -11,8 +11,6 @@ import six import sys import mock -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from pungi import checks from tests.helpers import load_config, PKGSET_REPOS diff --git a/tests/test_config_utils.py b/tests/test_config_utils.py index 26bfed45..ea6a978a 100644 --- a/tests/test_config_utils.py +++ b/tests/test_config_utils.py @@ -10,8 +10,6 @@ import sys from parameterized import parameterized -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi_utils import config_utils diff --git a/tests/test_createiso_phase.py b/tests/test_createiso_phase.py index f1a98a4a..91329ca7 100644 --- a/tests/test_createiso_phase.py +++ b/tests/test_createiso_phase.py @@ -7,8 +7,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests import helpers from pungi.createiso import CreateIsoOpts from pungi.phases import createiso diff --git a/tests/test_createiso_script.py b/tests/test_createiso_script.py index 631a54d3..b9bfc409 100644 --- a/tests/test_createiso_script.py +++ b/tests/test_createiso_script.py @@ -6,8 +6,6 @@ import os import sys from six.moves import StringIO -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests import helpers from pungi import createiso diff --git a/tests/test_createrepo_wrapper.py b/tests/test_createrepo_wrapper.py index 96cfc577..27de37fc 100644 --- a/tests/test_createrepo_wrapper.py +++ b/tests/test_createrepo_wrapper.py @@ -10,8 +10,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers.createrepo import CreaterepoWrapper diff --git a/tests/test_createrepophase.py b/tests/test_createrepophase.py index 021bae90..bd0c63bb 100644 --- a/tests/test_createrepophase.py +++ b/tests/test_createrepophase.py @@ -12,8 +12,6 @@ import os import six import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.createrepo import (CreaterepoPhase, create_variant_repo, get_productids_from_scm, diff --git a/tests/test_extra_files_phase.py b/tests/test_extra_files_phase.py index 081f3cf1..86ef8476 100644 --- a/tests/test_extra_files_phase.py +++ b/tests/test_extra_files_phase.py @@ -8,8 +8,6 @@ from productmd.extra_files import ExtraFiles import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases import extra_files from tests import helpers diff --git a/tests/test_extra_isos_phase.py b/tests/test_extra_isos_phase.py index a59fadd1..15061151 100644 --- a/tests/test_extra_isos_phase.py +++ b/tests/test_extra_isos_phase.py @@ -7,8 +7,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests import helpers from pungi.phases import extra_isos diff --git a/tests/test_fus_wrapper.py b/tests/test_fus_wrapper.py index 1d2dcf8c..0daf31fe 100644 --- a/tests/test_fus_wrapper.py +++ b/tests/test_fus_wrapper.py @@ -12,8 +12,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers import fus from .helpers import touch, PungiTestCase diff --git a/tests/test_gather.py b/tests/test_gather.py index f4cfaf7f..75c67e35 100644 --- a/tests/test_gather.py +++ b/tests/test_gather.py @@ -15,11 +15,6 @@ import logging from six.moves import cStringIO -HERE = os.path.dirname(__file__) -BINDIR = (os.path.join(HERE, '..', 'bin')) -sys.path.insert(0, os.path.join(HERE, '..')) -os.environ['PATH'] = '%s:%s' % (BINDIR, os.environ['PATH']) - from pungi.wrappers.pungi import PungiWrapper try: from pungi.dnf_wrapper import DnfWrapper, Conf diff --git a/tests/test_gather_method_deps.py b/tests/test_gather_method_deps.py index 8a96eb25..d3f04eb9 100644 --- a/tests/test_gather_method_deps.py +++ b/tests/test_gather_method_deps.py @@ -4,8 +4,6 @@ import mock import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.gather.methods import method_deps as deps from tests import helpers diff --git a/tests/test_gather_method_hybrid.py b/tests/test_gather_method_hybrid.py index c60d420a..68570315 100644 --- a/tests/test_gather_method_hybrid.py +++ b/tests/test_gather_method_hybrid.py @@ -8,8 +8,6 @@ import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.gather.methods import method_hybrid as hybrid from pungi.phases.pkgset.common import MaterializedPackageSet as PkgSet from tests import helpers diff --git a/tests/test_gather_method_nodeps.py b/tests/test_gather_method_nodeps.py index 6b077bb8..26b72eac 100644 --- a/tests/test_gather_method_nodeps.py +++ b/tests/test_gather_method_nodeps.py @@ -6,8 +6,6 @@ import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.gather.methods import method_nodeps as nodeps from tests import helpers diff --git a/tests/test_gather_phase.py b/tests/test_gather_phase.py index 95d5eef6..5c1fdcfe 100644 --- a/tests/test_gather_phase.py +++ b/tests/test_gather_phase.py @@ -12,8 +12,6 @@ except ImportError: import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases import gather from pungi.phases.pkgset.common import MaterializedPackageSet from pungi.phases.gather import _mk_pkg_map diff --git a/tests/test_gather_source_module.py b/tests/test_gather_source_module.py index 7482c83c..201ca49c 100644 --- a/tests/test_gather_source_module.py +++ b/tests/test_gather_source_module.py @@ -10,8 +10,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.gather.sources.source_module import GatherSourceModule from tests import helpers from pungi.module_util import Modulemd diff --git a/tests/test_graph.py b/tests/test_graph.py index 0f053dea..b22fc0e6 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -10,8 +10,6 @@ import sys from pungi.graph import SimpleAcyclicOrientedGraph -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - class SimpleAcyclicOrientedGraphTestCase(unittest.TestCase): diff --git a/tests/test_imagebuildphase.py b/tests/test_imagebuildphase.py index 4174fdbf..81f85c80 100644 --- a/tests/test_imagebuildphase.py +++ b/tests/test_imagebuildphase.py @@ -7,8 +7,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.image_build import ImageBuildPhase, CreateImageBuildThread from tests.helpers import DummyCompose, PungiTestCase, boom diff --git a/tests/test_imagechecksumphase.py b/tests/test_imagechecksumphase.py index 9934ca45..51a3624d 100644 --- a/tests/test_imagechecksumphase.py +++ b/tests/test_imagechecksumphase.py @@ -11,8 +11,6 @@ import sys import tempfile import shutil -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.image_checksum import ImageChecksumPhase, dump_checksums from tests.helpers import DummyCompose, PungiTestCase diff --git a/tests/test_initphase.py b/tests/test_initphase.py index 8dd6d0b6..da9890b4 100644 --- a/tests/test_initphase.py +++ b/tests/test_initphase.py @@ -12,8 +12,6 @@ import six import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.module_util import Modulemd from pungi.phases import init from tests.helpers import DummyCompose, PungiTestCase, touch, mk_boom, fake_run_in_threads diff --git a/tests/test_iso_wrapper.py b/tests/test_iso_wrapper.py index a870cfe2..fd995f2f 100644 --- a/tests/test_iso_wrapper.py +++ b/tests/test_iso_wrapper.py @@ -9,8 +9,6 @@ try: except ImportError: import unittest -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers import iso CORRECT_OUTPUT = '''dummy.iso: 31ff3e405e26ad01c63b62f6b11d30f6 diff --git a/tests/test_koji_wrapper.py b/tests/test_koji_wrapper.py index d47c9f67..3b8af90d 100644 --- a/tests/test_koji_wrapper.py +++ b/tests/test_koji_wrapper.py @@ -13,8 +13,6 @@ import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers.kojiwrapper import KojiWrapper, get_buildroot_rpms from .helpers import FIXTURE_DIR diff --git a/tests/test_linker.py b/tests/test_linker.py index 082b5a6c..2cfed49d 100644 --- a/tests/test_linker.py +++ b/tests/test_linker.py @@ -7,8 +7,6 @@ import os import stat import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi import linker from tests import helpers diff --git a/tests/test_liveimagesphase.py b/tests/test_liveimagesphase.py index c96e6737..71843835 100644 --- a/tests/test_liveimagesphase.py +++ b/tests/test_liveimagesphase.py @@ -8,8 +8,6 @@ import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.live_images import LiveImagesPhase, CreateLiveImageThread from tests.helpers import DummyCompose, PungiTestCase, boom diff --git a/tests/test_livemediaphase.py b/tests/test_livemediaphase.py index 42969944..444b4956 100644 --- a/tests/test_livemediaphase.py +++ b/tests/test_livemediaphase.py @@ -7,8 +7,6 @@ import os import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.livemedia_phase import LiveMediaPhase, LiveMediaThread from tests.helpers import DummyCompose, PungiTestCase, boom diff --git a/tests/test_lorax_wrapper.py b/tests/test_lorax_wrapper.py index 0ca40f8a..7daa77a4 100644 --- a/tests/test_lorax_wrapper.py +++ b/tests/test_lorax_wrapper.py @@ -10,8 +10,6 @@ import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers.lorax import LoraxWrapper diff --git a/tests/test_media_split.py b/tests/test_media_split.py index f4290126..14813850 100644 --- a/tests/test_media_split.py +++ b/tests/test_media_split.py @@ -8,8 +8,6 @@ import os import sys import mock -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from pungi import media_split diff --git a/tests/test_metadata.py b/tests/test_metadata.py index e2f5bed0..ea90d308 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -4,8 +4,6 @@ import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from tests import helpers from pungi import metadata diff --git a/tests/test_notifier.py b/tests/test_notifier.py index 89161e8d..b16de5f2 100644 --- a/tests/test_notifier.py +++ b/tests/test_notifier.py @@ -10,8 +10,6 @@ try: except ImportError: import unittest -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.notifier import PungiNotifier diff --git a/tests/test_orchestrator.py b/tests/test_orchestrator.py index 0ad2c33b..02809cca 100644 --- a/tests/test_orchestrator.py +++ b/tests/test_orchestrator.py @@ -16,8 +16,6 @@ from six.moves import configparser from parameterized import parameterized -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from tests.helpers import BaseTestCase, PungiTestCase, touch, FIXTURE_DIR from pungi_utils import orchestrator as o diff --git a/tests/test_osbs_phase.py b/tests/test_osbs_phase.py index 914fed73..6aef4767 100644 --- a/tests/test_osbs_phase.py +++ b/tests/test_osbs_phase.py @@ -7,8 +7,6 @@ import copy import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests import helpers from pungi import checks from pungi.phases import osbs diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py index 846e23a6..40ab9fce 100644 --- a/tests/test_ostree_installer_phase.py +++ b/tests/test_ostree_installer_phase.py @@ -7,8 +7,6 @@ import sys from kobo.shortcuts import force_list -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests import helpers from pungi.phases import ostree_installer as ostree from six.moves import shlex_quote diff --git a/tests/test_ostree_phase.py b/tests/test_ostree_phase.py index 6b7c931e..b782ace3 100644 --- a/tests/test_ostree_phase.py +++ b/tests/test_ostree_phase.py @@ -7,8 +7,6 @@ import mock import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests import helpers from pungi.phases import ostree diff --git a/tests/test_ostree_script.py b/tests/test_ostree_script.py index 777e7088..cf1dfe06 100644 --- a/tests/test_ostree_script.py +++ b/tests/test_ostree_script.py @@ -9,9 +9,6 @@ import mock import six import yaml -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) -sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'bin')) - from tests import helpers from pungi import ostree diff --git a/tests/test_ostree_utils.py b/tests/test_ostree_utils.py index bfc699e9..087e22c4 100644 --- a/tests/test_ostree_utils.py +++ b/tests/test_ostree_utils.py @@ -5,8 +5,6 @@ import mock import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests import helpers from pungi.ostree import utils diff --git a/tests/test_patch_iso.py b/tests/test_patch_iso.py index 480b94f3..0f7713de 100644 --- a/tests/test_patch_iso.py +++ b/tests/test_patch_iso.py @@ -8,8 +8,6 @@ try: except ImportError: import unittest -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests.helpers import boom, touch, copy_fixture from pungi_utils import patch_iso diff --git a/tests/test_pathmatch.py b/tests/test_pathmatch.py index 2c116415..b9e91981 100644 --- a/tests/test_pathmatch.py +++ b/tests/test_pathmatch.py @@ -5,8 +5,6 @@ import unittest import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.pathmatch import PathMatch, head_tail_split diff --git a/tests/test_phase_base.py b/tests/test_phase_base.py index a052e7d3..21558c75 100644 --- a/tests/test_phase_base.py +++ b/tests/test_phase_base.py @@ -10,8 +10,6 @@ import random import sys import time -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases import weaver from tests.helpers import DummyCompose, boom diff --git a/tests/test_pkgset_common.py b/tests/test_pkgset_common.py index e62dfcdb..39c5c845 100755 --- a/tests/test_pkgset_common.py +++ b/tests/test_pkgset_common.py @@ -6,8 +6,6 @@ import sys import mock import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.module_util import Modulemd from pungi.phases.pkgset import common from tests import helpers diff --git a/tests/test_pkgset_pkgsets.py b/tests/test_pkgset_pkgsets.py index 99892e95..6eb3381d 100644 --- a/tests/test_pkgset_pkgsets.py +++ b/tests/test_pkgset_pkgsets.py @@ -13,8 +13,6 @@ import tempfile import re from dogpile.cache import make_region -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.pkgset import pkgsets from tests import helpers diff --git a/tests/test_pkgset_source_koji.py b/tests/test_pkgset_source_koji.py index a121934a..5ce96e2b 100644 --- a/tests/test_pkgset_source_koji.py +++ b/tests/test_pkgset_source_koji.py @@ -11,8 +11,6 @@ try: except ImportError: import unittest -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.phases.pkgset.sources import source_koji from tests import helpers from pungi.module_util import Modulemd diff --git a/tests/test_repoclosure_wrapper.py b/tests/test_repoclosure_wrapper.py index 4fb06a07..7e4060ad 100755 --- a/tests/test_repoclosure_wrapper.py +++ b/tests/test_repoclosure_wrapper.py @@ -4,8 +4,6 @@ import os import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers import repoclosure as rc from . import helpers diff --git a/tests/test_runroot.py b/tests/test_runroot.py index e168b642..bde46e28 100644 --- a/tests/test_runroot.py +++ b/tests/test_runroot.py @@ -4,8 +4,6 @@ import mock import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.runroot import Runroot from tests import helpers diff --git a/tests/test_scm.py b/tests/test_scm.py index 7058302e..cd872530 100644 --- a/tests/test_scm.py +++ b/tests/test_scm.py @@ -12,8 +12,6 @@ import os import sys import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers import scm from tests.helpers import touch diff --git a/tests/test_test_phase.py b/tests/test_test_phase.py index a74b1e4f..e3a304a1 100644 --- a/tests/test_test_phase.py +++ b/tests/test_test_phase.py @@ -11,8 +11,6 @@ import os import six import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - import pungi.phases.test as test_phase from tests.helpers import DummyCompose, PungiTestCase, touch, mk_boom diff --git a/tests/test_unified_isos.py b/tests/test_unified_isos.py index 800fd9c4..3c502328 100755 --- a/tests/test_unified_isos.py +++ b/tests/test_unified_isos.py @@ -7,8 +7,6 @@ import sys import six from six.moves.configparser import SafeConfigParser -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - from tests.helpers import PungiTestCase, FIXTURE_DIR, touch, mk_boom from pungi_utils import unified_isos diff --git a/tests/test_util.py b/tests/test_util.py index 46d8a588..d60edd20 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -13,8 +13,6 @@ import shutil import subprocess import six -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi import compose from pungi import util diff --git a/tests/test_variant_wrapper.py b/tests/test_variant_wrapper.py index 34cf31ac..26041edc 100644 --- a/tests/test_variant_wrapper.py +++ b/tests/test_variant_wrapper.py @@ -8,8 +8,6 @@ import os import sys from six.moves import cStringIO -sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) - from pungi.wrappers.variants import VariantsXmlParser VARIANTS_WITH_WHITESPACE = """