| Index: scripts/slave/unittests/telemetry_test.py
|
| diff --git a/scripts/slave/unittests/telemetry_test.py b/scripts/slave/unittests/telemetry_test.py
|
| index 47facfab70b4e458d61528281c990b1f5b38c2e1..9b4676a2d044a26a70797f7b834f93acff1c4b5d 100755
|
| --- a/scripts/slave/unittests/telemetry_test.py
|
| +++ b/scripts/slave/unittests/telemetry_test.py
|
| @@ -55,7 +55,8 @@ class TelemetryTest(unittest.TestCase):
|
| fp = self._GetDefaultFactoryProperties()
|
|
|
| cmd = [self.telemetry, '--print-cmd',
|
| - '--factory-properties=%s' % json.dumps(fp)]
|
| + '--factory-properties=%s' % json.dumps(fp),
|
| + '--chart-output-filename=name.out']
|
|
|
| ret = runScript(cmd, filter_obj=self.capture, print_cmd=False)
|
| self.assertEqual(ret, 0)
|
| @@ -77,8 +78,9 @@ class TelemetryTest(unittest.TestCase):
|
| '\'--single-step\' ' +
|
| '\'--\' ' +
|
| '\'src/tools/perf/run_benchmark\' \'-v\' ' +
|
| - '\'--output-format=buildbot\' ' +
|
| - '\'--browser=android-chrome-shell\' \'sunspider\''
|
| + '\'--output-format=chartjson\' ' +
|
| + '\'--browser=android-chrome-shell\' \'sunspider\' ' +
|
| + '\'--output=name.out\''
|
| ])
|
|
|
| self.assertEqual(expectedText, self.capture.text)
|
| @@ -88,7 +90,8 @@ class TelemetryTest(unittest.TestCase):
|
| fp['extra_args'] = ['--profile-dir=fake_dir']
|
|
|
| cmd = [self.telemetry, '--print-cmd',
|
| - '--factory-properties=%s' % json.dumps(fp)]
|
| + '--factory-properties=%s' % json.dumps(fp),
|
| + '--chart-output-filename=tmpfile']
|
|
|
| ret = runScript(cmd, filter_obj=self.capture, print_cmd=False)
|
| self.assertEqual(ret, 0)
|
| @@ -111,9 +114,10 @@ class TelemetryTest(unittest.TestCase):
|
| '\'--single-step\' ' +
|
| '\'--\' ' +
|
| '\'src/tools/perf/run_benchmark\' \'-v\' ' +
|
| - '\'--output-format=buildbot\' ' +
|
| + '\'--output-format=chartjson\' ' +
|
| '\'--profile-dir=fake_dir\' '+
|
| - '\'--browser=android-chrome-shell\' \'sunspider\''
|
| + '\'--browser=android-chrome-shell\' \'sunspider\' ' +
|
| + '\'--output=tmpfile\''
|
| ])
|
|
|
| self.assertEqual(expectedText, self.capture.text)
|
|
|