Revert "[fuchsia] add option to retry test environment setup steps."

This reverts commit e2beb407.

Reason for revert: The original change caused webkit_layout_tests
failures due to a change in qemu_target.QemuTarget() arguments.
See crbug.com/1050935

Original change's description:
> [fuchsia] add option to retry test environment setup steps.
>
> Also adds debug logging for qemu-img invocations in the qemu target.
>
> Bug: 1046861
> Change-Id: Ia37a9701391e3437cf03f1f041ddca671d5e0770
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2023387
> Commit-Queue: Stephen Roe <steveroe@google.com>
> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#740058}

TBR=kmarshall@chromium.org,sergeyu@chromium.org,steveroe@google.com,chonggu@google.com

Change-Id: I62ad6c4e708dcf32556fd6b5f6b4d1d6145640c2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1046861
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050606
Auto-Submit: Stephen Roe <steveroe@google.com>
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740306}

build/fuchsia/aemu_target.py

@@ -17,7 +17,7 @@ class AemuTarget(qemu_target.QemuTarget):
                hardware_gpu):
     super(AemuTarget, self).__init__(output_dir, target_cpu, system_log_file,
                                      emu_type, cpu_cores, require_kvm,
-                                     ram_size_mb, qemu_img_retries=0)
+                                     ram_size_mb)
 
     # TODO(crbug.com/1000907): Enable AEMU for arm64.
     if platform.machine() == 'aarch64':

build/fuchsia/common_args.py

@@ -155,7 +155,6 @@ def GetDeploymentTargetForArgs(args, require_kvm=False):
                          'emu_type':args.device,
                          'ram_size_mb':args.memory })
     if args.device == 'qemu':
-      target_args.update({ 'qemu_img_retries':args.qemu_img_retries })
       return QemuTarget(**target_args)
     else:
       target_args.update({

build/fuchsia/qemu_target.py

@@ -15,7 +15,6 @@ import shutil
 import subprocess
 import sys
 import tempfile
-import time
 
 from common import GetEmuRootForPlatform, EnsurePathExists
 
@@ -29,19 +28,16 @@ GUEST_MAC_ADDRESS = '52:54:00:63:5e:7b'
 # Capacity of the system's blobstore volume.
 EXTENDED_BLOBSTORE_SIZE = 1073741824  # 1GB
 
-# qemu-img p99 run time is 26 seconds.  Using 2x the p99 time as the timeout.
-QEMU_IMG_TIMEOUT_SEC = 52
 
 class QemuTarget(emu_target.EmuTarget):
   def __init__(self, output_dir, target_cpu, system_log_file,
-               emu_type, cpu_cores, require_kvm, ram_size_mb, qemu_img_retries):
+               emu_type, cpu_cores, require_kvm, ram_size_mb):
     super(QemuTarget, self).__init__(output_dir, target_cpu,
                                      system_log_file)
     self._emu_type=emu_type
     self._cpu_cores=cpu_cores
     self._require_kvm=require_kvm
     self._ram_size_mb=ram_size_mb
-    self._qemu_img_retries=qemu_img_retries
 
   def _GetEmulatorName(self):
     return self._emu_type
@@ -75,8 +71,7 @@ class QemuTarget(emu_target.EmuTarget):
         '-snapshot',
         '-drive', 'file=%s,format=qcow2,if=none,id=blobstore,snapshot=on' %
                     _EnsureBlobstoreQcowAndReturnPath(self._output_dir,
-                                                      self._GetTargetSdkArch(),
-                                                      self._qemu_img_retries),
+                                                      self._GetTargetSdkArch()),
         '-device', 'virtio-blk-pci,drive=blobstore',
 
         # Use stdio for the guest OS only; don't attach the QEMU interactive
@@ -153,7 +148,6 @@ class QemuTarget(emu_target.EmuTarget):
     qemu_command.append('-nographic')
     return qemu_command
 
-
 def _ComputeFileHash(filename):
   hasher = md5.new()
   with open(filename, 'rb') as f:
@@ -165,69 +159,12 @@ def _ComputeFileHash(filename):
   return hasher.hexdigest()
 
 
-def _ExecWithTimeout(command, timeout_sec):
-  """Execute command in subprocess with timeout.
-
-  Has debug logging for run time measurements.
-
-  Returns: None if command timed out or return code if command completed.
-  """
-
-  p = subprocess.Popen(command)
-  start_sec = time.time()
-  num_checks = 0
-  while p.poll() is None and time.time() - start_sec < timeout_sec:
-    time.sleep(1)
-    num_checks += 1
-  stop_sec = time.time()
-
-  # Sleep durations are much less than 1 second for python2.7 on arm64
-  # Logging number of checks and total duration to help debug timeouts.
-  logging.debug('qemu_target sleep checks: %d' % num_checks)
-  logging.debug('qemu_target sleep start: %f' % start_sec)
-  logging.debug('qemu_target sleep stop: %f' % stop_sec)
-  logging.debug('qemu_target sleep duration: %f' % float(stop_sec - start_sec))
-
-  if p.poll() is None:
-    p.kill()
-    return None
-
-  return p.returncode
-
-
-def _ExecWithTimeoutAndRetry(command, timeout_sec, retries):
-  """ Execute command in subprocess with timeout and retries.
-
-  Raises CalledProcessError if command does not complete successfully.
-  """
-
-  try:
-    tries = 0
-    status = None
-    while status is None and tries <= retries:
-      tries += 1
-      logging.debug('qemu_target call: %s' % command)
-      status = _ExecWithTimeout(command, timeout_sec)
-      logging.debug('qemu_target done: %s' % command[0])
-
-    if status is None:
-      raise subprocess.CalledProcessError(-1, command)
-    if status:
-      raise subprocess.CalledProcessError(status, command)
-  except subprocess.CalledProcessError as error:
-    logging.debug(
-        'qemu_target._EnsureBlobStoreQcowAndReturnPath qemu_img error: %s' %
-        error)
-    raise
-
-
-def _EnsureBlobstoreQcowAndReturnPath(output_dir, target_arch,
-                                      qemu_img_retries):
+def _EnsureBlobstoreQcowAndReturnPath(output_dir, target_arch):
   """Returns a file containing the Fuchsia blobstore in a QCOW format,
   with extra buffer space added for growth."""
 
-  qemu_img_tool = os.path.join(common.GetEmuRootForPlatform('qemu'),
-                               'bin', 'qemu-img')
+  qimg_tool = os.path.join(common.GetEmuRootForPlatform('qemu'),
+                           'bin', 'qemu-img')
   fvm_tool = common.GetHostToolPathFromPlatform('fvm')
   blobstore_path = boot_data.GetTargetFile('storage-full.blk', target_arch,
                                            'qemu')
@@ -256,10 +193,8 @@ def _EnsureBlobstoreQcowAndReturnPath(output_dir, target_arch,
 
   # Construct a QCOW image from the extended, temporary FVM volume.
   # The result will be retained in the build output directory for re-use.
-  # TODO(crbug.com/1046861): Remove retries after qemu-img bug is fixed.
-  qemu_img_cmd = [qemu_img_tool, 'convert', '-f', 'raw', '-O', 'qcow2',
-              '-c', extended_blobstore.name, qcow_path]
-  _ExecWithTimeoutAndRetry(qemu_img_cmd, QEMU_IMG_TIMEOUT_SEC, qemu_img_retries)
+  subprocess.check_call([qimg_tool, 'convert', '-f', 'raw', '-O', 'qcow2',
+                         '-c', extended_blobstore.name, qcow_path])
 
   # Write out a hash of the original blobstore file, so that subsequent runs
   # can trivially check if a cached extended FVM volume is available for reuse.

build/fuchsia/test_runner.py

@@ -33,13 +33,6 @@ def main():
   parser.add_argument('--gtest_repeat',
                       help='GTest repeat value to use. This also disables the '
                            'test launcher timeout.')
-  # TODO(crbug.com/1046861): Remove qemu-img-retries flag when qemu-img arm64
-  # hang bug is fixed.
-  parser.add_argument('--qemu-img-retries',
-                      default=0,
-                      type=int,
-                      help='Number of times that the qemu-img command can be '
-                           'retried.')
   parser.add_argument('--test-launcher-retry-limit',
                       help='Number of times that test suite will retry failing '
                            'tests. This is multiplicative with --gtest_repeat.')