commit 3d4b0c037fb175f98e1bab410ad3f43a97e9db32
author Cheng-Han Yang <chenghan@google.com> Thu Aug 23 18:24:14 2018 +0800
committer chrome-bot <chrome-bot@chromium.org> Thu Sep 20 05:15:18 2018 -0700
tree 87e6c68cee53d57154c3c3e8296a824ef6e38a4f
parent da3f3e85b71211f19fc4ea2bc3f38b41d24c7818

gooftool: Add an argument to specify upload retry interval

Add an argument in gooftool and finalize pytest to specify
upload retry interval. If not specified, use the default
value.

BUG=chromium:877002
TEST=make test; manually test on DUT

Change-Id: I7f130cf36b462d77df76cc9e0c3e0efd705126d5
Reviewed-on: https://chromium-review.googlesource.com/1186389
Commit-Ready: Cheng-Han Yang <chenghan@chromium.org>
Tested-by: Cheng-Han Yang <chenghan@chromium.org>
Reviewed-by: Yong Hong <yhong@google.com>

py/gooftool/commands.py

diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index d2dbcd5..4cffb72 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -615,6 +615,9 @@
     '--upload_method', metavar='METHOD:PARAM',
     help=('How to perform the upload.  METHOD should be one of '
           '{ftp, shopfloor, ftps, cpfe}.'))
+_upload_retry_interval_arg = CmdArg(
+    '--upload_retry_interval', type=int, default=None,
+    help='Retry interval in seconds. 0 to prevent retry.')
 _add_file_cmd_arg = CmdArg(
     '--add_file', metavar='FILE', action='append',
     help='Extra file to include in report (must be an absolute path)')
@@ -622,6 +625,7 @@
 
 @Command('upload_report',
          _upload_method_cmd_arg,
+         _upload_retry_interval_arg,
          _add_file_cmd_arg)
 def UploadReport(options):
   """Create a report containing key device details."""
@@ -637,16 +641,26 @@
     logging.warning('REPORT UPLOAD SKIPPED (report left at %s)', target_path)
     return
   method, param = options.upload_method.split(':', 1)
+
+  if options.upload_retry_interval is not None:
+    retry_interval = options.upload_retry_interval
+  else:
+    retry_interval = report_upload.DEFAULT_RETRY_INTERVAL
+
   if method == 'shopfloor':
     report_upload.ShopFloorUpload(
         target_path, param,
-        'GRT' if options.command_name == 'finalize' else None)
+        'GRT' if options.command_name == 'finalize' else None,
+        retry_interval=retry_interval)
   elif method == 'ftp':
-    report_upload.FtpUpload(target_path, 'ftp:' + param)
+    report_upload.FtpUpload(target_path, 'ftp:' + param,
+                            retry_interval=retry_interval)
   elif method == 'ftps':
-    report_upload.CurlUrlUpload(target_path, '--ftp-ssl-reqd ftp:%s' % param)
+    report_upload.CurlUrlUpload(target_path, '--ftp-ssl-reqd ftp:%s' % param,
+                                retry_interval=retry_interval)
   elif method == 'cpfe':
-    report_upload.CpfeUpload(target_path, pipes.quote(param))
+    report_upload.CpfeUpload(target_path, pipes.quote(param),
+                             retry_interval=retry_interval)
   else:
     raise Error('unknown report upload method %r' % method)
 
@@ -660,6 +674,7 @@
          _hwdb_path_cmd_arg,
          _hwid_status_list_cmd_arg,
          _upload_method_cmd_arg,
+         _upload_retry_interval_arg,
          _add_file_cmd_arg,
          _probe_results_cmd_arg,
          _hwid_cmd_arg,