Revert "Recipes: Use strict coverage, part 2"

This reverts commit 4dbc9cead90eb31756a1c1bf61ea01f223c5fe96.

Reason for revert: flaky?

Original change's description:
> Recipes: Use strict coverage, part 2
> 
> Bug: skia:6473
> Change-Id: Ia3a1587215a6a868c9577f2d864bc5c4e671a3fa
> Reviewed-on: https://skia-review.googlesource.com/13812
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
> 

TBR=borenet@google.com,rmistry@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: Id746de56609fbaf5ec8ecdd22b5e60bcb3c01fa2
Reviewed-on: https://skia-review.googlesource.com/13819
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

1 files changed, 19 insertions, 18 deletions

diff --git a/infra/bots/recipe_modules/flavor/gn_chromebook_flavor.py b/infra/bots/recipe_modules/flavor/gn_chromebook_flavor.py
index 34ffa54197..a07d54380a 100644
--- a/infra/bots/recipe_modules/flavor/gn_chromebook_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_chromebook_flavor.py
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-
 from recipe_engine import recipe_api
 
 import default_flavor
@@ -32,28 +31,28 @@ class GNChromebookFlavorUtils(gn_flavor.GNFlavorUtils):
 
     self._bin_dir = self.m.vars.chromeos_homedir + 'bin'
 
-  @property
-  def user_ip(self):
-    if not self._user_ip:
-      ssh_info = self.m.run(self.m.python.inline, 'read chromeos ip',
-                            program="""
-      import os
-      SSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')
-      with open(SSH_MACHINE_FILE, 'r') as f:
-        print f.read()
-      """,
-      stdout=self.m.raw_io.output(),
-      infra_step=True).stdout
-
-      self._user_ip = json.loads(ssh_info).get(u'user_ip', 'ERROR')
-    return self._user_ip
+  def _get_remote_ip(self):
+    ssh_info = self.m.run(self.m.python.inline, 'read chromeos ip',
+                          program="""
+    import os
+    SSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')
+    with open(SSH_MACHINE_FILE, 'r') as f:
+      print f.read()
+    """,
+    stdout=self.m.raw_io.output(),
+    infra_step=True).stdout
+
+    self._user_ip = json.loads(ssh_info).get(u'user_ip', 'ERROR')
 
   def _ssh(self, title, *cmd, **kwargs):
+    if not self._user_ip:
+      self._get_remote_ip()
+
     if 'infra_step' not in kwargs:
       kwargs['infra_step'] = True
 
     ssh_cmd = ['ssh', '-oConnectTimeout=15', '-oBatchMode=yes',
-               '-t', '-t', self.user_ip] + list(cmd)
+               '-t', '-t', self._user_ip] + list(cmd)
 
     return self._run(title, ssh_cmd, **kwargs)
 
@@ -162,7 +161,9 @@ class GNChromebookFlavorUtils(gn_flavor.GNFlavorUtils):
     self._ssh('rm %s' % path, 'rm', '-f', path)
 
   def _prefix_device_path(self, device_path):
-    return '%s:%s' % (self.user_ip, device_path)
+    if not self._user_ip:
+      self._get_remote_ip() #pragma:nocover
+    return '%s:%s' % (self._user_ip, device_path)
 
   def copy_file_to_device(self, host_path, device_path):
     device_path = self._prefix_device_path(device_path)