Skip to content

Commit 3d83ffb

Browse files
author
Damien Barker
committed
QPR-12959 update conftest
1 parent 74af4b6 commit 3d83ffb

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

Examples/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ def pytest_runtest_makereport(item, call):
2424
# - UPDATE_FAILED_EXPECTED_OUTPUT → copy only if test failed
2525
if copy_all_output or (copy_failed_output and report.failed):
2626
# Build test path
27-
test_name = item.name
28-
test_name = test_name.replace('-', '/', 1)
27+
test_name_props = item.name.split("_", 1)
28+
test_name = test_name_props[1]
2929
test_path = Path(item.config.rootdir) / test_name
3030

3131
copy_existing_files(test_path)

Examples/ore_examples_helper.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,13 @@ def _locate_ore_exe(self):
9494
self.ore_exe = "..\\..\\..\\..\\build\\ore\\App\\RelWithDebInfo\\ore.exe"
9595
elif os.path.isfile("..\\..\\build\\App\\Release\\ore.exe"):
9696
self.ore_exe = "..\\..\\build\\App\\Release\\ore.exe"
97+
elif os.path.isfile("..\\..\\build\\ore\\App\\RelWithDebInfo\\ore.exe"):
98+
self.ore_exe = "..\\..\\build\\ore\\App\\RelWithDebInfo\\ore.exe"
9799
elif os.path.isfile("..\\..\\..\\build\\App\\Release\\ore.exe"):
98100
self.ore_exe = "..\\..\\..\\build\\App\\Release\\ore.exe"
99101
else:
100102
print_on_console("ORE executable not found.")
101-
quit()
103+
sys.exit(1)
102104
else:
103105
if os.path.isfile("..\\..\\App\\bin\\Win32\\Release\\ore.exe"):
104106
self.ore_exe = "..\\..\\App\\bin\\Win32\\Release\\ore.exe"
@@ -110,7 +112,7 @@ def _locate_ore_exe(self):
110112
self.ore_exe = "..\\..\\..\\build\\App\\ore.exe"
111113
else:
112114
print_on_console("ORE executable not found.")
113-
quit()
115+
sys.exit(1)
114116
else:
115117
if os.path.isfile("../../App/build/ore"):
116118
self.ore_exe = "../../App/build/ore"
@@ -138,7 +140,7 @@ def _locate_ore_exe(self):
138140
self.ore_exe = "/ore/App/ore"
139141
else:
140142
print_on_console("ORE executable not found.")
141-
quit()
143+
sys.exit(1)
142144
print_on_console("Using ORE executable " + (os.path.abspath(self.ore_exe)))
143145

144146
def print_headline(self, headline):

0 commit comments

Comments
 (0)