tests: drop sys.path modification

It's unnecessary to add the path manually.

Signed-off-by: Haibo Lin <hlin@redhat.com>

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)
 

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

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
 
 

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
 
 

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
 

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
 

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
 
 

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

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
 

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
 
 

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,

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
 

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
 

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

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

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
 

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

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
 

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

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

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):
 

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
 

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
 

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

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

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

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
 

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
 

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
 

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
 
 

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
 
 

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

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
 
 

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
 

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

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

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
 

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
 

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
 

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
 

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
 
 

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
 

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

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
 

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

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

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
 

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
 

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
 

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
 

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
 

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 = """