Update after review comments

Author: coldav

scripts/testing/city_runner/runner.py

@@ -121,7 +121,7 @@ def execute(self):
         test_source = self.args.test_source  # CSV
         disabled_source = self.args.disabled_source # Disabled CSV
         ignored_source = self.args.ignored_source # Ignored CSV
-        override_source = self.args.override_source # Override CSV        
+        override_source = self.args.override_source # Override CSV
         self.tests = self.profile.load_tests(test_source,
                                              disabled_source,
                                              ignored_source,

scripts/testing/city_runner/test_info.py

@@ -323,10 +323,10 @@ def add_run(self, run):
         if run.test.xfail:
             if run.status == "PASS":
                 self.num_xpasses += 1
-                run.status = "XFAIL_UNEXPECTEDLY_PASSED"
+                run.status = "XPASS"
             elif run.status == "FAIL":
                 self.num_xfails += 1
-                run.status = "XFAIL_EXPECTEDLY_FAILED"
+                run.status = "XFAIL"
         elif run.status == "PASS":
             self.num_passes += 1
         elif run.test.mayfail:
@@ -356,7 +356,7 @@ def finish(self, profile):
         self.fail_list = []
         self.timeout_list = []
         self.xpass_list = []
-        self.may_fail_failed_list = []
+        self.mayfail_list = []
 
         for test in self.tests:
             try:
@@ -368,10 +368,10 @@ def finish(self, profile):
                     self.fail_list.append(run)
                 elif run.status == "TIMEOUT":
                     self.timeout_list.append(run)
-                elif run.status == "XFAIL_UNEXPECTEDLY_PASSED":
+                elif run.status == "XPASS":
                     self.xpass_list.append(run)
                 elif run.status == "MAYFAIL":
-                    self.may_fail_failed_list.append(run)
+                    self.mayfail_list.append(run)
         for test in not_runs:
             run = profile.create_run(test)
             run.status = "FAIL"
@@ -384,7 +384,7 @@ def finish(self, profile):
             self.fail_list.append(run)
         self.fail_list.sort(key=lambda r: r.test.name)
         self.xpass_list.sort(key=lambda r: r.test.name)
-        self.may_fail_failed_list.sort(key=lambda r: r.test.name)
+        self.mayfail_list.sort(key=lambda r: r.test.name)
 
     def write_junit(self, out, suite_name):
         """ Print results to the Junit XML file for reading by Jenkins."""

scripts/testing/city_runner/ui.py

@@ -121,9 +121,9 @@ def print_results(self, results):
                 self.out.write("  %s\n" % run.test.name)
             self.out.write("\n")
 
-        if results.may_fail_failed_list:
+        if results.mayfail_list:
             self.out.write(self.fmt.red("May Fail failing tests:\n"))
-            for run in results.may_fail_failed_list:
+            for run in results.mayfail_list:
                 self.out.write("  %s\n" % run.test.name)
             self.out.write("\n")