review cleanup

yanne · yanne · commit d486762ef753 · 2020-09-15T14:25:44.000+03:00
diff --git a/atest/robot/cli/runner/status_rc.robot b/atest/robot/cli/runner/status_rc.robot
@@ -11,7 +11,7 @@ Zero RC when all tests pass
     ${EMPTY}                    ${PASSING}      rc=0
     --statusrc                  ${PASSING}      rc=0
 
-Non-zero RC when ests fail
+Non-zero RC when tests fail
     ${EMPTY}                    ${FAILING}      rc=1
     -r report.html              ${FAILING}      rc=1
     -l log.html --statusrc      ${FAILING}      rc=1
diff --git a/src/robot/model/totalstatistics.py b/src/robot/model/totalstatistics.py
@@ -30,19 +30,19 @@ def visit(self, visitor):
         visitor.visit_total_statistics(self)
 
     def __iter__(self):
-        return iter([self.all])
+        yield self.all
 
     @property
     def message(self):
         """String representation of the statistics.
 
         For example::
-            2 tests total, 1 passed, 1 failed
+            2 tests, 1 passed, 1 failed
         """
         test_or_task = 'test' if not self._rpa else 'task'
-        atotal, aend, apass, afail = self._get_counts(self.all)
+        total, end, passed, failed = self._get_counts(self.all)
         return ('%d %s%s, %d passed, %d failed'
-                % (atotal, test_or_task, aend, apass, afail))
+                % (total, test_or_task, end, passed, failed))
 
     def _get_counts(self, stat):
         ending = 's' if stat.total != 1 else ''
diff --git a/src/robot/result/model.py b/src/robot/result/model.py
@@ -148,6 +148,13 @@ def passed(self):
     def passed(self, passed):
         self.status = 'PASS' if passed else 'FAIL'
 
+    @property
+    def critical(self):
+        warnigs.warn("'TestCase.criticality' has been deprecated and always "
+                     " returns 'True'.",
+                     UserWarning)
+        return True
+
 
 class TestSuite(model.TestSuite):
     """Represents results of a single test suite.
diff --git a/src/robot/running/runner.py b/src/robot/running/runner.py
@@ -96,7 +96,7 @@ def end_suite(self, suite):
             failure = self._run_teardown(suite.keywords.teardown, self._suite_status)
             if failure:
                 self._suite.suite_teardown_failed(unic(failure))
-                self._suite_status.critical_failure_occurred()
+                self._suite_status.failure_occurred()
         self._suite.endtime = get_timestamp()
         self._suite.message = self._suite_status.message
         self._context.end_suite(ModelCombiner(suite, self._suite))
@@ -146,7 +146,7 @@ def visit_test(self, test):
                 failure = self._run_teardown(test.keywords.teardown, status,
                                              result)
                 if failure:
-                    status.critical_failure_occurred()
+                    status.failure_occurred()
         if not status.failures and result.timeout and result.timeout.timed_out():
             status.test_failed(result.timeout.get_message())
             result.message = status.message
diff --git a/src/robot/running/status.py b/src/robot/running/status.py
@@ -81,7 +81,7 @@ def teardown_executed(self, failure=None):
             self.failure.teardown = unic(failure)
             self.exit.failure_occurred(failure)
 
-    def critical_failure_occurred(self):
+    def failure_occurred(self):
         self.exit.failure_occurred()
 
     def error_occurred(self):
