From 178558cb3df485874fe8fe7f44d4f054aa5ce49f Mon Sep 17 00:00:00 2001 From: Dolphin von Chips Date: Thu, 30 Jul 2020 17:50:59 +0500 Subject: [PATCH] CI: allow running testcases with pmbootstrap from pip (MR 1467) --- .../testcases/add_pmbootstrap_to_import_path/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py b/.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py index 6082c616f..432c98b35 100755 --- a/.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py +++ b/.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py @@ -5,6 +5,7 @@ import shutil import sys import os +import importlib from distutils.sysconfig import get_python_lib @@ -33,5 +34,7 @@ def path_pmbootstrap(): sys.exit(1) -# Add pmbootstrap dir to import path -sys.path.append(os.path.realpath(path_pmbootstrap())) +# Check if pmb module can be imported +if importlib.util.find_spec("pmb") is None: + # Add pmbootstrap dir to import path + sys.path.append(os.path.realpath(path_pmbootstrap()))