Add json test results format support for SwarmingIsolatedScriptTest

scripts/slave/recipe_modules/swarming/__init__.py

Index: scripts/slave/recipe_modules/swarming/__init__.py
diff --git a/scripts/slave/recipe_modules/swarming/__init__.py b/scripts/slave/recipe_modules/swarming/__init__.py
index 553fdfced77d7737e2314540b2acaf165542ba56..2c0077968f88a110d55cdaacc92d56e8def3743f 100644
--- a/scripts/slave/recipe_modules/swarming/__init__.py
+++ b/scripts/slave/recipe_modules/swarming/__init__.py
@@ -15,9 +15,12 @@ DEPS = [
   'test_utils',
 ]
 
-from recipe_engine.recipe_api import Property
+try:

[Ken Russell (switch to Gerrit), 2016/10/04 01:43:43]

Add a comment that this try/catch enables the results_merger_unittest to run.

[nednguyen, 2016/10/04 01:49:52]

This may not be needed if I migrate result_merger to a script

+  from recipe_engine.recipe_api import Property
 
-PROPERTIES = {
-  'show_shards_in_collect_step': Property(default=False, kind=bool),
-  'show_isolated_out_in_collect_step': Property(default=True, kind=bool),
-}
+  PROPERTIES = {
+    'show_shards_in_collect_step': Property(default=False, kind=bool),
+    'show_isolated_out_in_collect_step': Property(default=True, kind=bool),
+  }
+except ImportError:
+  pass