Skip to content

Commit 574772e

Browse files
authored
do not short circuit if split is functional and title does not exist (#969)
1 parent c6ffcce commit 574772e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

modules/testrail_integration.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,15 @@ def reportable(platform_to_test=None):
231231
)
232232
return False
233233

234+
split_ = os.environ.get("STARFOX_SPLIT")
235+
functional = split_ and split_.startswith("functional")
236+
234237
plan_title = get_plan_title(version, channel)
235238
logging.warning(f"Checking plan title: {plan_title}")
236239
this_plan = tr_session.matching_plan_in_milestone(
237240
TESTRAIL_FX_DESK_PRJ, channel_milestone.get("id"), plan_title
238241
)
239-
if not this_plan:
242+
if not this_plan and not functional:
240243
logging.warning(
241244
f"Session reportable: could not find {plan_title} (milestone: {channel_milestone.get('id')})"
242245
)
@@ -275,13 +278,11 @@ def reportable(platform_to_test=None):
275278
return covered_mappings < expected_mappings
276279
else:
277280
logging.warning(f"Getting reportability for STARfox in {platform}...")
278-
if not os.environ.get("STARFOX_SPLIT"):
281+
if not split_:
279282
logging.warning("No split selected")
280283
return False
281284
manifest = TestKey(TEST_KEY_LOCATION)
282-
expected_suites = manifest.get_valid_suites_in_split(
283-
os.environ["STARFOX_SPLIT"], suite_numbers=True
284-
)
285+
expected_suites = manifest.get_valid_suites_in_split(split_, suite_numbers=True)
285286
if not expected_suites:
286287
logging.warning("This split is empty, not running or reporting.")
287288
return False

0 commit comments

Comments
 (0)