Updating swarming api to check for chartjson results from a finished

scripts/slave/recipe_modules/test_utils/test_api.py

Index: scripts/slave/recipe_modules/test_utils/test_api.py
diff --git a/scripts/slave/recipe_modules/test_utils/test_api.py b/scripts/slave/recipe_modules/test_utils/test_api.py
index e83f77bcde154f18be8bdc51a863b6ec3cc1e1a0..6ab62055fa446b5a076acdaf5772f19f3f301cc2 100644
--- a/scripts/slave/recipe_modules/test_utils/test_api.py
+++ b/scripts/slave/recipe_modules/test_utils/test_api.py
@@ -116,11 +116,14 @@ class TestUtilsTestApi(recipe_test_api.RecipeTestApi):
                                     shards=1, swarming_internal_failure=False,
                                     isolated_script_passing=True, valid=True,
                                     missing_shards=[],
-                                    empty_shards=[]):
+                                    empty_shards=[],
+                                    output_chartjson=False):
     """Produces a test results' compatible json for isolated script tests. """
     per_shard_results = []
+    per_shard_chartjson_results = []
     for i in xrange(shards):
       jsonish_results = {}
+      chartjsonish_results = {}
       jsonish_results['valid'] = valid
       # Keep shard 0's results equivalent to the old code to minimize
       # expectation diffs.
@@ -134,7 +137,10 @@ class TestUtilsTestApi(recipe_test_api.RecipeTestApi):
         jsonish_results['failures'] = tests_run
         jsonish_results['successes'] = []
       jsonish_results['times'] = {t : 0.1 for t in tests_run}
+      chartjsonish_results['dummy'] =  'dummy%d' % i
+      chartjsonish_results['charts'] = {'entry1': 'chart1', 'entry2': 'chart2'}
       per_shard_results.append(jsonish_results)
+      per_shard_chartjson_results.append(chartjsonish_results)
     if swarming:
       jsonish_shards = []
       files_dict = {}
@@ -143,14 +149,28 @@ class TestUtilsTestApi(recipe_test_api.RecipeTestApi):
           'failure': not passing,
           'internal_failure': swarming_internal_failure
         })
-        if i not in missing_shards:
-          swarming_path = str(i)
-          swarming_path += '\\output.json' if is_win else '/output.json'
-          if i not in empty_shards:
-            files_dict[swarming_path] = json.dumps(per_shard_results[i])
-          else:
-            # Simulate a complete harness failure.
-            files_dict[swarming_path] = ''
+        swarming_path = str(i)
+        swarming_path += '\\output.json' if is_win else '/output.json'
+
+        chartjson_swarming_path = str(i)
+        chartjson_swarming_path += \
+          '\\chartjson-output.json' \
+            if is_win else '/chartjson-output.json'
+
+        # Determine what output we are writing and if it is empty or not
+        output_missing = i in missing_shards and not output_chartjson
+        chartjson_output_missing = i in missing_shards and output_chartjson
+        output_empty = i in empty_shards and not output_chartjson
+        chartjson_output_empty = i in empty_shards and output_chartjson
+
+        if not output_missing:
+          files_dict[swarming_path] = \
+            '' if output_empty else json.dumps(per_shard_results[i])
+        if not chartjson_output_missing:

[Ken Russell (switch to Gerrit), 2016/09/19 23:41:19]

I think it would be more realistic to only synthesize the per-shard chartjson
files if output_chartjson is true. What do you think? That would avoid the
"outdir_json" expectation changes in the majority of the recipe simulation tests
(example:
scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_linux_gpu.json
), making those easier to visually confirm.

[eyaich1, 2016/09/20 13:56:59]

Done.

+          files_dict[chartjson_swarming_path] = \
+            '' if chartjson_output_empty \
+              else json.dumps(per_shard_chartjson_results[i])
+
       jsonish_summary = {'shards': jsonish_shards}
       files_dict['summary.json'] = json.dumps(jsonish_summary)
       return self.m.raw_io.output_dir(files_dict)