Add test_skia.py, isolates for test_skia, images, skps

infra/bots/flavor/default_flavor.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Default flavor utils class, used for desktop bots."""
 
@@ skipping 53 matching lines @@
   for that flavor.
 
   For example, the AndroidFlavorUtils will override the functions for
   copying files between the host and Android device, as well as the
   'step' function, so that commands may be run through ADB.
   """
   def __init__(self, bot_info, *args, **kwargs):
     self._bot_info = bot_info
     self.chrome_path = os.path.join(os.path.expanduser('~'), 'src')
 
-  def step(self, cmd, **kwargs):
+  def run(self, cmd, **kwargs):
     """Runs a step as appropriate for this flavor."""
-    path_to_app = self._bot_info.out_dir.join(
-        self._bot_info.configuration, cmd[0])
+    path_to_app = os.path.join(self._bot_info.out_dir,
+                               self._bot_info.configuration, cmd[0])
     if (sys.platform == 'linux' and
         'x86_64' in self._bot_info.bot_name and
         not 'TSAN' in self._bot_info.bot_name):
       new_cmd = ['catchsegv', path_to_app]
     else:
       new_cmd = [path_to_app]
     new_cmd.extend(cmd[1:])
     return self._bot_info.run(new_cmd, **kwargs)
 
 
@@ skipping 46 matching lines @@
                        'from host to device is undefined and only allowed if '
                        'host_path and device_path are the same (%s vs %s).' % (
                        str(host_path), str(device_path)))
 
   def create_clean_device_dir(self, path):
     """Like shutil.rmtree() + os.makedirs(), but on a connected device."""
     self.create_clean_host_dir(path)
 
   def create_clean_host_dir(self, path):
     """Convenience function for creating a clean directory."""
-    shutil.rmtree(path)
+    if os.path.exists(path):
+      shutil.rmtree(path)
     os.makedirs(path)
 
   def install(self):
     """Run device-specific installation steps."""
     pass
 
   def cleanup_steps(self):
     """Run any device-specific cleanup steps."""
     pass
 
   def get_device_dirs(self):
     """ Set the directories which will be used by the build steps.
 
     These refer to paths on the same device where the test executables will
     run, for example, for Android bots these are paths on the Android device
     itself. For desktop bots, these are just local paths.
     """
     join = lambda p: os.path.join(self._bot_info.build_dir, p)
     return DeviceDirs(
-        dm_dir=join('dm'),
+        dm_dir=os.path.join(self._bot_info.swarm_out_dir, 'dm'),
         perf_data_dir=self._bot_info.perf_data_dir,
         resource_dir=self._bot_info.resource_dir,
         images_dir=join('images'),
         skp_dir=self._bot_info.local_skp_dir,
         tmp_dir=join('tmp'))
 
   def __repr__(self):
     return '<%s object>' % self.__class__.__name__  # pragma: no cover