From d41941748938ae2a1057b7ffa3497029abdc6bd4 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Fri, 26 Jul 2019 10:00:38 -0700 Subject: [PATCH 1/2] Fix overwriting of cwd in test discovery path list --- news/2 Fixes/6417.md | 1 + pythonFiles/testing_tools/run_adapter.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 news/2 Fixes/6417.md diff --git a/news/2 Fixes/6417.md b/news/2 Fixes/6417.md new file mode 100644 index 000000000000..c0bbed103301 --- /dev/null +++ b/news/2 Fixes/6417.md @@ -0,0 +1 @@ +Fix overwriting of cwd in the path list when discovering tests. diff --git a/pythonFiles/testing_tools/run_adapter.py b/pythonFiles/testing_tools/run_adapter.py index d21f3efd1b70..f3975a4af758 100644 --- a/pythonFiles/testing_tools/run_adapter.py +++ b/pythonFiles/testing_tools/run_adapter.py @@ -4,9 +4,8 @@ # Replace the "." entry. import os.path import sys -sys.path[0] = os.path.dirname( - os.path.dirname( - os.path.abspath(__file__))) + +sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from testing_tools.adapter.__main__ import parse_args, main From 7153071a6e2ef2bf8e28ac1f88827cc171ca1a42 Mon Sep 17 00:00:00 2001 From: Eric Snow Date: Mon, 29 Jul 2019 12:27:41 -0600 Subject: [PATCH 2/2] cleaner formatting --- pythonFiles/testing_tools/run_adapter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pythonFiles/testing_tools/run_adapter.py b/pythonFiles/testing_tools/run_adapter.py index f3975a4af758..04a8cdae4c9b 100644 --- a/pythonFiles/testing_tools/run_adapter.py +++ b/pythonFiles/testing_tools/run_adapter.py @@ -5,7 +5,10 @@ import os.path import sys -sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +sys.path.insert(1, + os.path.dirname( + os.path.dirname( + os.path.abspath(__file__)))) from testing_tools.adapter.__main__ import parse_args, main