Skip to content

Commit 27ce583

Browse files
committed
Update after review comments
1 parent b7a8b93 commit 27ce583

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

scripts/testing/city_runner/runner.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def execute(self):
121121
test_source = self.args.test_source # CSV
122122
disabled_source = self.args.disabled_source # Disabled CSV
123123
ignored_source = self.args.ignored_source # Ignored CSV
124-
override_source = self.args.override_source # Override CSV
124+
override_source = self.args.override_source # Override CSV
125125
self.tests = self.profile.load_tests(test_source,
126126
disabled_source,
127127
ignored_source,

scripts/testing/city_runner/test_info.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ def add_run(self, run):
323323
if run.test.xfail:
324324
if run.status == "PASS":
325325
self.num_xpasses += 1
326-
run.status = "XFAIL_UNEXPECTEDLY_PASSED"
326+
run.status = "XPASS"
327327
elif run.status == "FAIL":
328328
self.num_xfails += 1
329-
run.status = "XFAIL_EXPECTEDLY_FAILED"
329+
run.status = "XFAIL"
330330
elif run.status == "PASS":
331331
self.num_passes += 1
332332
elif run.test.mayfail:
@@ -356,7 +356,7 @@ def finish(self, profile):
356356
self.fail_list = []
357357
self.timeout_list = []
358358
self.xpass_list = []
359-
self.may_fail_failed_list = []
359+
self.mayfail_list = []
360360

361361
for test in self.tests:
362362
try:
@@ -368,10 +368,10 @@ def finish(self, profile):
368368
self.fail_list.append(run)
369369
elif run.status == "TIMEOUT":
370370
self.timeout_list.append(run)
371-
elif run.status == "XFAIL_UNEXPECTEDLY_PASSED":
371+
elif run.status == "XPASS":
372372
self.xpass_list.append(run)
373373
elif run.status == "MAYFAIL":
374-
self.may_fail_failed_list.append(run)
374+
self.mayfail_list.append(run)
375375
for test in not_runs:
376376
run = profile.create_run(test)
377377
run.status = "FAIL"
@@ -384,7 +384,7 @@ def finish(self, profile):
384384
self.fail_list.append(run)
385385
self.fail_list.sort(key=lambda r: r.test.name)
386386
self.xpass_list.sort(key=lambda r: r.test.name)
387-
self.may_fail_failed_list.sort(key=lambda r: r.test.name)
387+
self.mayfail_list.sort(key=lambda r: r.test.name)
388388

389389
def write_junit(self, out, suite_name):
390390
""" Print results to the Junit XML file for reading by Jenkins."""

scripts/testing/city_runner/ui.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ def print_results(self, results):
121121
self.out.write(" %s\n" % run.test.name)
122122
self.out.write("\n")
123123

124-
if results.may_fail_failed_list:
124+
if results.mayfail_list:
125125
self.out.write(self.fmt.red("May Fail failing tests:\n"))
126-
for run in results.may_fail_failed_list:
126+
for run in results.mayfail_list:
127127
self.out.write(" %s\n" % run.test.name)
128128
self.out.write("\n")
129129

0 commit comments

Comments
 (0)