diff --git a/avocado/core/loader.py b/avocado/core/loader.py index d190243a0ecdc2bbbac3f172518341ddcab78678..9496883837f3a3724a826892a64697c39a09fd4b 100644 --- a/avocado/core/loader.py +++ b/avocado/core/loader.py @@ -358,7 +358,7 @@ class FileLoader(TestLoader): test_name = test_path module_name = os.path.basename(test_path).split('.')[0] test_module_dir = os.path.dirname(test_path) - sys.path.append(test_module_dir) + sys.path.insert(0, test_module_dir) stdin, stdout, stderr = sys.stdin, sys.stdout, sys.stderr try: sys.stdin = None diff --git a/selftests/all/doc/doc_build_test.py b/selftests/all/doc/doc_build_test.py index b975c7a96c936441dd0ba4e67b676cf017173d7d..af9359c336bdb886c6a2bb88810ab2471a64bd55 100644 --- a/selftests/all/doc/doc_build_test.py +++ b/selftests/all/doc/doc_build_test.py @@ -10,7 +10,7 @@ import sys basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process diff --git a/selftests/all/functional/avocado/argument_parsing_tests.py b/selftests/all/functional/avocado/argument_parsing_tests.py index 8ff678f511b7767b2e4c29d2c29970080deb3893..564a79d5a46dfd63b84cf49b00e2f42c836d6a00 100644 --- a/selftests/all/functional/avocado/argument_parsing_tests.py +++ b/selftests/all/functional/avocado/argument_parsing_tests.py @@ -11,7 +11,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core import data_dir from avocado.core import job_id diff --git a/selftests/all/functional/avocado/basic_tests.py b/selftests/all/functional/avocado/basic_tests.py index eb1c67189c6544f9bb14fbf2d8f2d49fb64ff3e2..2f4b66d5269aa4d7afeb55f2095da389c19d0f73 100644 --- a/selftests/all/functional/avocado/basic_tests.py +++ b/selftests/all/functional/avocado/basic_tests.py @@ -15,7 +15,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process from avocado.utils import script diff --git a/selftests/all/functional/avocado/export_variables_tests.py b/selftests/all/functional/avocado/export_variables_tests.py index e76ede933746581055744349091fdfd95ae8bfb0..33a22193b4964a926f15676e7e469e3a186b8d1d 100644 --- a/selftests/all/functional/avocado/export_variables_tests.py +++ b/selftests/all/functional/avocado/export_variables_tests.py @@ -8,7 +8,7 @@ import shutil basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado import VERSION from avocado.utils import process diff --git a/selftests/all/functional/avocado/gdb_tests.py b/selftests/all/functional/avocado/gdb_tests.py index 1f0fa908098d50ac83dd259978fac40a048d90b3..89fbc7e0aaa8def1ef62188f9ff33f2e0e5c93c0 100644 --- a/selftests/all/functional/avocado/gdb_tests.py +++ b/selftests/all/functional/avocado/gdb_tests.py @@ -8,7 +8,7 @@ import tempfile basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process diff --git a/selftests/all/functional/avocado/job_timeout_tests.py b/selftests/all/functional/avocado/job_timeout_tests.py index fc1e675b6fa6841b993001547c156523ff4d2cc3..8a983ddf8868cc88d25ab4fdf8995944ae2b3548 100644 --- a/selftests/all/functional/avocado/job_timeout_tests.py +++ b/selftests/all/functional/avocado/job_timeout_tests.py @@ -14,7 +14,7 @@ basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process from avocado.utils import script diff --git a/selftests/all/functional/avocado/journal_tests.py b/selftests/all/functional/avocado/journal_tests.py index 7b417a566934cd4bacfb66538d6fe91eff51b86d..37ead7a0328443f0f350dd6747f25c3f9bae76dc 100644 --- a/selftests/all/functional/avocado/journal_tests.py +++ b/selftests/all/functional/avocado/journal_tests.py @@ -10,7 +10,7 @@ import shutil basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process diff --git a/selftests/all/functional/avocado/loader_tests.py b/selftests/all/functional/avocado/loader_tests.py index e7274857867cb8c27f872d066e30f6edc0105be3..b39e915819b9a7130d2a35f35344b28f1269495e 100644 --- a/selftests/all/functional/avocado/loader_tests.py +++ b/selftests/all/functional/avocado/loader_tests.py @@ -12,7 +12,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import script from avocado.utils import process diff --git a/selftests/all/functional/avocado/multiplex_tests.py b/selftests/all/functional/avocado/multiplex_tests.py index 90ac1c976d97c485f80089c079d009ea39325d17..511d7f43a1fbf3a6f70346ac45699b8d2650efcf 100644 --- a/selftests/all/functional/avocado/multiplex_tests.py +++ b/selftests/all/functional/avocado/multiplex_tests.py @@ -15,7 +15,7 @@ basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process diff --git a/selftests/all/functional/avocado/output_check_tests.py b/selftests/all/functional/avocado/output_check_tests.py index 038a51d5bef639de40539f4fafa03f3c955473f9..af7a1d4da1a40e3d80cf521a901f8eb2f3273637 100644 --- a/selftests/all/functional/avocado/output_check_tests.py +++ b/selftests/all/functional/avocado/output_check_tests.py @@ -12,7 +12,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process from avocado.utils import script diff --git a/selftests/all/functional/avocado/output_tests.py b/selftests/all/functional/avocado/output_tests.py index f4f3fc4207723c4b93530c304734b58033f77906..f3563b57ea150589d449a5aeeff3fc6da16c379b 100644 --- a/selftests/all/functional/avocado/output_tests.py +++ b/selftests/all/functional/avocado/output_tests.py @@ -15,7 +15,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process from avocado.core.output import TermSupport diff --git a/selftests/all/functional/avocado/standalone_tests.py b/selftests/all/functional/avocado/standalone_tests.py index 234056892be4de9f084d33e89f3d5e81f53afd66..e1eea99dbdc763ca817cd54d16192fdff0cc60b5 100644 --- a/selftests/all/functional/avocado/standalone_tests.py +++ b/selftests/all/functional/avocado/standalone_tests.py @@ -10,7 +10,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process diff --git a/selftests/all/functional/avocado/sysinfo_tests.py b/selftests/all/functional/avocado/sysinfo_tests.py index c1368fe9a48b3005696e955e97e85c4c8aaa28f7..4fc4ecb7124fd35fc770d0984ed58085ae99e071 100644 --- a/selftests/all/functional/avocado/sysinfo_tests.py +++ b/selftests/all/functional/avocado/sysinfo_tests.py @@ -12,7 +12,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process diff --git a/selftests/all/functional/avocado/unittest_compat.py b/selftests/all/functional/avocado/unittest_compat.py index 13b9d8d3871985699c17d9b0c9ab54d07dc8eb1e..1f55cc8d6072e8be349c90f5d1ef25667e2b4d30 100644 --- a/selftests/all/functional/avocado/unittest_compat.py +++ b/selftests/all/functional/avocado/unittest_compat.py @@ -11,7 +11,7 @@ basedir = os.path.join( os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import script from avocado.utils import process diff --git a/selftests/all/functional/avocado/utils_tests.py b/selftests/all/functional/avocado/utils_tests.py index aed13905a59da3846f74173ed058bfe071052f27..6b956930cf0b757143da590a61e18142a3148ce0 100644 --- a/selftests/all/functional/avocado/utils_tests.py +++ b/selftests/all/functional/avocado/utils_tests.py @@ -13,7 +13,7 @@ else: basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process diff --git a/selftests/all/functional/avocado/wrapper_tests.py b/selftests/all/functional/avocado/wrapper_tests.py index 3c647fe01b271471f18f95b684bf4c0d85b2fac0..7e7cd7036dac4e03bd5e2f30a9a000075cc84d35 100644 --- a/selftests/all/functional/avocado/wrapper_tests.py +++ b/selftests/all/functional/avocado/wrapper_tests.py @@ -9,7 +9,7 @@ basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import process from avocado.utils import script diff --git a/selftests/all/unit/avocado/archive_unittest.py b/selftests/all/unit/avocado/archive_unittest.py index 11c0d9fdb8cbc3732600fa6d082080e5147f770e..d447141cdfa7cc1df6cf26fc8e9c9ca99209dc4d 100644 --- a/selftests/all/unit/avocado/archive_unittest.py +++ b/selftests/all/unit/avocado/archive_unittest.py @@ -9,7 +9,7 @@ import random basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import archive from avocado.utils import crypto diff --git a/selftests/all/unit/avocado/astring_unittest.py b/selftests/all/unit/avocado/astring_unittest.py index ac22187c9c57bf3001698cfe8c8046a00aa6a4ba..9928a395bd6a9d2e821f7a15671890a6c82541a8 100644 --- a/selftests/all/unit/avocado/astring_unittest.py +++ b/selftests/all/unit/avocado/astring_unittest.py @@ -6,7 +6,7 @@ import sys basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import astring diff --git a/selftests/all/unit/avocado/datadir_unittest.py b/selftests/all/unit/avocado/datadir_unittest.py index 0497b9241638e0ce07870061ccbbc2343b7c040c..13503c3f3ede73cebbfa8656a2bc2b1c3e131eae 100644 --- a/selftests/all/unit/avocado/datadir_unittest.py +++ b/selftests/all/unit/avocado/datadir_unittest.py @@ -11,7 +11,7 @@ from flexmock import flexmock basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core import settings diff --git a/selftests/all/unit/avocado/distro_unittest.py b/selftests/all/unit/avocado/distro_unittest.py index e777f7ce579812fa14b27c29e4196defed71d08e..dfd6a985d3c5f890f5e912d9a5f595ed2b05ff5d 100644 --- a/selftests/all/unit/avocado/distro_unittest.py +++ b/selftests/all/unit/avocado/distro_unittest.py @@ -10,7 +10,7 @@ from flexmock import flexmock basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import distro diff --git a/selftests/all/unit/avocado/gdb_unittest.py b/selftests/all/unit/avocado/gdb_unittest.py index 892c958b2f040e70cddb8fdea5ab85a1fd6a6e61..30a8c6e61819996b691560e4e65d62f7833e91b1 100644 --- a/selftests/all/unit/avocado/gdb_unittest.py +++ b/selftests/all/unit/avocado/gdb_unittest.py @@ -6,7 +6,7 @@ import unittest basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import gdb diff --git a/selftests/all/unit/avocado/jsonresult_unittest.py b/selftests/all/unit/avocado/jsonresult_unittest.py index b3458807df214f1a8c4c5961b76ecc88fa22c9b5..6b11182abe9186a52d2c9e13b590827af7aad45c 100644 --- a/selftests/all/unit/avocado/jsonresult_unittest.py +++ b/selftests/all/unit/avocado/jsonresult_unittest.py @@ -10,7 +10,7 @@ import shutil basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado import Test from avocado.core.plugins import jsonresult diff --git a/selftests/all/unit/avocado/loader_unittest.py b/selftests/all/unit/avocado/loader_unittest.py index 014316785409a2578f587b766d534ba46b684f5f..c9a6246d06511c054e12f4f30c33b298bc8cc693 100644 --- a/selftests/all/unit/avocado/loader_unittest.py +++ b/selftests/all/unit/avocado/loader_unittest.py @@ -10,7 +10,7 @@ basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..') basedir = os.path.abspath(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core import test from avocado.core import exceptions diff --git a/selftests/all/unit/avocado/plugins_unittest.py b/selftests/all/unit/avocado/plugins_unittest.py index 3bf53c7ad4df957c5067caf6f4c3f9e98ea24b01..adbbb12548daa79a10fd6b6629819831c5d91a0c 100644 --- a/selftests/all/unit/avocado/plugins_unittest.py +++ b/selftests/all/unit/avocado/plugins_unittest.py @@ -6,7 +6,7 @@ import unittest basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core.plugins import plugin diff --git a/selftests/all/unit/avocado/restclient_response_unittest.py b/selftests/all/unit/avocado/restclient_response_unittest.py index 28599983563c75e2ab359d8eca33f6d207388415..a59ab216189d06c3dee412663446c39cca93132e 100644 --- a/selftests/all/unit/avocado/restclient_response_unittest.py +++ b/selftests/all/unit/avocado/restclient_response_unittest.py @@ -6,7 +6,7 @@ import unittest basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core.restclient import response diff --git a/selftests/all/unit/avocado/settings_unittest.py b/selftests/all/unit/avocado/settings_unittest.py index a98955753d7845bda60db09d827d9a5bf56fcf4e..9f1b76e8b00d61255b5e5772af290baa86dbfb18 100644 --- a/selftests/all/unit/avocado/settings_unittest.py +++ b/selftests/all/unit/avocado/settings_unittest.py @@ -11,7 +11,7 @@ else: basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core import settings diff --git a/selftests/all/unit/avocado/sysinfo_unittest.py b/selftests/all/unit/avocado/sysinfo_unittest.py index 4367a2947cccc0cc367703af2680751c42f4b995..c6e44abb215176c2ec16a3a1f90bb31837e8b9da 100644 --- a/selftests/all/unit/avocado/sysinfo_unittest.py +++ b/selftests/all/unit/avocado/sysinfo_unittest.py @@ -12,7 +12,7 @@ else: basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core import sysinfo diff --git a/selftests/all/unit/avocado/test_unittest.py b/selftests/all/unit/avocado/test_unittest.py index 3c9b1a34d411be49d88971aeb44b66c2d72e29e4..97f88fb75bbc2125c4098d213db1f35b5fa9a7e0 100644 --- a/selftests/all/unit/avocado/test_unittest.py +++ b/selftests/all/unit/avocado/test_unittest.py @@ -12,7 +12,7 @@ else: basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.core import test from avocado.utils import script diff --git a/selftests/all/unit/avocado/utils_linux_modules_unittest.py b/selftests/all/unit/avocado/utils_linux_modules_unittest.py index c4f4e1ed2904807da5774c0dde79a8c770850bc8..cfb95f2d8eafd5888cf8efb452411950083126fe 100644 --- a/selftests/all/unit/avocado/utils_linux_modules_unittest.py +++ b/selftests/all/unit/avocado/utils_linux_modules_unittest.py @@ -6,7 +6,7 @@ import sys basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import linux_modules diff --git a/selftests/all/unit/avocado/utils_output_unittest.py b/selftests/all/unit/avocado/utils_output_unittest.py index 573fb0daf2869d24da1720f875db1544629886f5..68f903fe2b3320b097b3b88943b4c26c2fa36125 100644 --- a/selftests/all/unit/avocado/utils_output_unittest.py +++ b/selftests/all/unit/avocado/utils_output_unittest.py @@ -6,7 +6,7 @@ import sys basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado.utils import output diff --git a/selftests/all/unit/avocado/xunit_unittest.py b/selftests/all/unit/avocado/xunit_unittest.py index 764ae0705e3086b03c229b47c8061c21d319b6d6..595bc3ff04ca13683944358cc5a3a47b565c4433 100644 --- a/selftests/all/unit/avocado/xunit_unittest.py +++ b/selftests/all/unit/avocado/xunit_unittest.py @@ -10,7 +10,7 @@ import shutil basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basedir = os.path.dirname(basedir) if os.path.isdir(os.path.join(basedir, 'avocado')): - sys.path.append(basedir) + sys.path.insert(0, basedir) from avocado import Test from avocado.core.plugins import xunit