[pinpoint] Refactor Quest Generator.

dashboard/dashboard/pinpoint/handlers/quest_parser.py

Index: dashboard/dashboard/pinpoint/handlers/quest_parser.py
diff --git a/dashboard/dashboard/pinpoint/handlers/quest_parser.py b/dashboard/dashboard/pinpoint/handlers/quest_parser.py
new file mode 100644
index 0000000000000000000000000000000000000000..268324c20eadac8d9ebb054d051fadf67c5aa51e
--- /dev/null
+++ b/dashboard/dashboard/pinpoint/handlers/quest_parser.py
@@ -0,0 +1,99 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.

[perezju, 2017/08/23 08:59:58]

nit: nit: I don't know if "parser" is the right word here (I think as a parser
as something that takes as input a block of text). Maybe "quest_maker",
"quest_factory"? "quest_generator" was actually fine too.

[dtu, 2017/08/24 23:17:52]

Done.

+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import json
+
+from dashboard.pinpoint.models import quest as quest_module
+
+
+_DEFAULT_REPEAT_COUNT = 20
+
+_SWARMING_EXTRA_ARGS = (
+    '--isolated-script-test-output', '${ISOLATED_OUTDIR}/output.json',
+    '--isolated-script-test-chartjson-output',
+    '${ISOLATED_OUTDIR}/chartjson-output.json',
+)
+
+
+def ParseQuests(request):

[perezju, 2017/08/23 08:59:59]

Add some docstring explaining the args it takes and return value.

[dtu, 2017/08/24 23:17:52]

Done.

+  arguments = {}
+  quests = []
+
+  quest_arguments, quest = _FindIsolateQuest(request)
+  arguments.update(quest_arguments)
+  quests.append(quest)
+
+  dimensions = request.get('dimensions')
+  if not dimensions:
+    return arguments, quests

[perezju, 2017/08/23 08:59:59]

nit: I think it's clearer the other way around, so you have positive boolean
tests and a single exit point at the end.

if dimensions:
  # stuff to do if there are dimensions

return arguments, quests

[perezju, 2017/08/23 09:16:11]

I've just seen the other patch that goes on top of this. The way that works out
looks very clear. You can ignore this comment here.

[dtu, 2017/08/24 23:17:52]

Acknowledged.

+  dimensions = json.loads(dimensions)
+  arguments['dimensions'] = json.dumps(dimensions)
+
+  if arguments['target'] in ('telemetry_perf_tests',
+                             'telemetry_perf_webview_tests'):
+    quest_arguments, quest = _TelemetryRunTestQuest(request, dimensions)
+    arguments.update(quest_arguments)
+    quests.append(quest)
+
+    metric = request.get('metric')
+    if not metric:

[perezju, 2017/08/23 08:59:58]

nit: Ditto.

[dtu, 2017/08/24 23:17:52]

Acknowledged.

+      return arguments, quests
+    arguments['metric'] = metric
+
+    quests.append(quest_module.ReadChartJsonValue(metric, request.get('story')))
+  else:
+    raise NotImplementedError()
+
+  return arguments, quests
+
+
+def _FindIsolateQuest(request):
+  arguments = {}
+
+  configuration = request.get('configuration')
+  if not configuration:
+    raise TypeError('Missing "configuration" argument.')
+  arguments['configuration'] = configuration
+
+  target = request.get('target')
+  if not target:
+    raise TypeError('Missing "target" argument.')
+  arguments['target'] = target
+
+  return arguments, quest_module.FindIsolate(configuration, target)
+
+
+def _TelemetryRunTestQuest(request, dimensions):
+  arguments = {}
+  swarming_extra_args = []
+
+  benchmark = request.get('benchmark')
+  if not benchmark:
+    raise TypeError('Missing "benchmark" argument.')
+  arguments['benchmark'] = benchmark
+  swarming_extra_args.append(benchmark)
+
+  story = request.get('story')
+  if story:
+    arguments['story'] = story
+    swarming_extra_args += ('--story-filter', story)
+
+  repeat_count = request.get('repeat_count')
+  if repeat_count:
+    arguments['repeat_count'] = repeat_count
+  else:
+    repeat_count = '20'
+  swarming_extra_args += ('--pageset-repeat', repeat_count)
+
+  browser = request.get('browser')
+  if not browser:
+    raise TypeError('Missing "browser" argument.')
+  arguments['browser'] = browser
+  swarming_extra_args += ('--browser', browser)
+
+  swarming_extra_args += ('-v', '--upload-results',
+                          '--output-format', 'chartjson')
+  swarming_extra_args += _SWARMING_EXTRA_ARGS
+
+  return arguments, quest_module.RunTest(dimensions, swarming_extra_args)