[chromedriver] Do not count successfully retry

Only increase retry count when retry has failed.
Also increase the max retry count number to 5.

Bug: chromedriver:3681
Change-Id: I03fdf89179f7486a96b3cf5c88f1d612805974b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2594091Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Shengfa Lin <shengfa@google.com>
Cr-Commit-Position: refs/heads/master@{#837612}

chrome/test/chromedriver/client/chromedriver.py

@@ -14,7 +14,7 @@ from websocket_connection import WebSocketConnection
 
 ELEMENT_KEY_W3C = "element-6066-11e4-a52e-4f735466cecf"
 ELEMENT_KEY = "ELEMENT"
-MAX_RETRY_COUNT = 3
+MAX_RETRY_COUNT = 5
 
 class ChromeDriverException(Exception):
   pass
@@ -152,9 +152,14 @@ class ChromeDriver(object):
                 p.kill()
 
         if ChromeDriver.retry_count < MAX_RETRY_COUNT:
-          ChromeDriver.retry_count = ChromeDriver.retry_count + 1
           ChromeDriver.retried_tests.append(kwargs.get('test_name'))
-          self._InternalInit(server_url, **kwargs)
+          try:
+            self._InternalInit(server_url, **kwargs)
+          except:
+            # Only count it as retry if failed
+            print 'Retry ', ChromeDriver.retry_count, ' failed'
+            ChromeDriver.retry_count = ChromeDriver.retry_count + 1
+            raise
         else:
           raise