cheets_CTS_N: Relax consistency check more to cover duplicated names.

In
https://chromium-review.googlesource.com/c/459779/
I loosened the consistency check for the individual case where tradefed
runs more tests than expected, but for this case we need to adjust the
total test count. Otherwise we end up with inconsistency error.

BUG=b:36523200
TEST=manually

Change-Id: Id59698d85e72f76fc4106ea2aa3d4c60a145d771
Reviewed-on: https://chromium-review.googlesource.com/467126
Commit-Ready: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
(cherry picked from commit cb435c838146302c37727149bff874d66bb8f23d)
Reviewed-on: https://chromium-review.googlesource.com/468492
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
index f4459a3..f4744ea 100644
--- a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
+++ b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
@@ -413,6 +413,8 @@
                 if not self._consistent(tests, passed, failed, notexecuted):
                     logging.warning('Test count inconsistent. %s', self.summary)
                 total_passed += passed
+                if tests > expected_tests:
+                    total_tests += tests - expected_tests
             # The DUT has rebooted at this point and is in a clean state.
 
         # Final classification of test results.