tests import path: put shipped pmb code first

Always test the pmb code from the parent folder of the tests, even if
a stable version of pmbootstrap is installed with pip or pysetup.
This commit is contained in:
Oliver Smith 2018-10-27 16:21:29 +02:00
parent 56d813421f
commit 424ad3f078
27 changed files with 27 additions and 27 deletions

View File

@ -24,7 +24,7 @@ import pytest
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.chroot.apk_static import pmb.chroot.apk_static
import pmb.config import pmb.config
import pmb.parse.apkindex import pmb.parse.apkindex

View File

@ -24,7 +24,7 @@ import filecmp
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.aportgen import pmb.aportgen
import pmb.aportgen.core import pmb.aportgen.core

View File

@ -22,7 +22,7 @@ import pytest
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.aportgen import pmb.aportgen
import pmb.config import pmb.config

View File

@ -22,7 +22,7 @@ import pytest
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.chroot.apk_static import pmb.chroot.apk_static
import pmb.parse.apkindex import pmb.parse.apkindex
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -21,7 +21,7 @@ import sys
import pytest import pytest
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.build.other import pmb.build.other
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -29,7 +29,7 @@ import shutil
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.build import pmb.build
import pmb.build._package import pmb.build._package

View File

@ -27,7 +27,7 @@ import pytest
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.build import pmb.build
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -21,7 +21,7 @@ import sys
import pytest import pytest
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.aportgen import pmb.aportgen
import pmb.config import pmb.config

View File

@ -22,7 +22,7 @@ import pytest
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.build import pmb.build
import pmb.chroot.distccd import pmb.chroot.distccd

View File

@ -22,7 +22,7 @@ import time
import pytest import pytest
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.helpers.git import pmb.helpers.git
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -21,7 +21,7 @@ import sys
import pytest import pytest
# Import from parent directory # Import from parent directory
sys.path.append(os.path.abspath( sys.path.insert(0, os.path.abspath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.helpers.logging import pmb.helpers.logging
import pmb.helpers.other import pmb.helpers.other

View File

@ -21,7 +21,7 @@ import sys
import pytest import pytest
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.config import pmb.config
import pmb.parse import pmb.parse

View File

@ -22,7 +22,7 @@ import sys
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.aportgen.device import pmb.aportgen.device
import pmb.config import pmb.config
import pmb.config.init import pmb.config.init

View File

@ -23,7 +23,7 @@ import glob
import filecmp import filecmp
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.parse.apkindex import pmb.parse.apkindex
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -20,7 +20,7 @@ import os
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.helpers.mount import pmb.helpers.mount

View File

@ -22,7 +22,7 @@ import pytest
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.build.newapkbuild import pmb.build.newapkbuild
import pmb.config import pmb.config

View File

@ -23,7 +23,7 @@ import sys
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.parse._apkbuild import pmb.parse._apkbuild

View File

@ -27,7 +27,7 @@ import pytest
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.parse.apkindex import pmb.parse.apkindex
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -27,7 +27,7 @@ import pytest
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.config import pmb.config
import pmb.config.init import pmb.config.init

View File

@ -28,7 +28,7 @@ import sys
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.helpers.pkgrel_bump import pmb.helpers.pkgrel_bump
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -34,7 +34,7 @@ import time
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.chroot.apk_static import pmb.chroot.apk_static
import pmb.parse.apkindex import pmb.parse.apkindex
import pmb.helpers.logging import pmb.helpers.logging

View File

@ -23,7 +23,7 @@ import sys
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.aportgen.device import pmb.aportgen.device
import pmb.config import pmb.config
import pmb.config.init import pmb.config.init

View File

@ -22,7 +22,7 @@ import sys
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.helpers.repo import pmb.helpers.repo

View File

@ -28,7 +28,7 @@ import pytest
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.helpers.run_core import pmb.helpers.run_core

View File

@ -22,7 +22,7 @@ import pytest
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.chroot.root import pmb.chroot.root
import pmb.chroot.user import pmb.chroot.user
import pmb.helpers.run import pmb.helpers.run

View File

@ -22,7 +22,7 @@ import pytest
# Import from parent directory # Import from parent directory
pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/..")) pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
sys.path.append(pmb_src) sys.path.insert(0, pmb_src)
import pmb.helpers.git import pmb.helpers.git
import pmb.helpers.logging import pmb.helpers.logging
import pmb.parse.version import pmb.parse.version

View File

@ -20,7 +20,7 @@ import os
import sys import sys
# Import from parent directory # Import from parent directory
sys.path.append(os.path.realpath( sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/.."))) os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.parse.version import pmb.parse.version