From 918427237c0bd65f2500c3b0b3ffbd003f100797 Mon Sep 17 00:00:00 2001 From: Bill Feng Date: Tue, 28 Aug 2018 12:03:38 -0700 Subject: [PATCH] fixed indentation --- .../qps/json_run_localhost_scenario_gen.py | 30 +++++++++---------- test/cpp/qps/qps_json_driver_scenario_gen.py | 24 +++++++-------- .../sanity/check_qps_scenario_changes.py | 4 +-- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/test/cpp/qps/json_run_localhost_scenario_gen.py b/test/cpp/qps/json_run_localhost_scenario_gen.py index 3cd2b799fec..01f6a699d55 100755 --- a/test/cpp/qps/json_run_localhost_scenario_gen.py +++ b/test/cpp/qps/json_run_localhost_scenario_gen.py @@ -18,21 +18,21 @@ import gen_build_yaml as gen import json def generate_args(): - all_scenario_set = gen.generate_yaml() - all_scenario_set = all_scenario_set['tests'] - json_run_localhost_scenarios = \ - [item for item in all_scenario_set if item['name'] == 'qps_json_driver'] - json_run_localhost_arg_set = \ - [item['args'][2] for item in json_run_localhost_scenarios \ - if 'args' in item and len(item['args']) > 2] - deserialized_scenarios = [json.loads(item)['scenarios'][0] \ - for item in json_run_localhost_arg_set] - all_scenarios = {scenario['name'].encode('ascii', 'ignore'): \ - '\'{\'scenarios\' : [' + json.dumps(scenario) + ']}\'' \ - for scenario in deserialized_scenarios} + all_scenario_set = gen.generate_yaml() + all_scenario_set = all_scenario_set['tests'] + json_run_localhost_scenarios = \ + [item for item in all_scenario_set if item['name'] == 'qps_json_driver'] + json_run_localhost_arg_set = \ + [item['args'][2] for item in json_run_localhost_scenarios \ + if 'args' in item and len(item['args']) > 2] + deserialized_scenarios = [json.loads(item)['scenarios'][0] \ + for item in json_run_localhost_arg_set] + all_scenarios = {scenario['name'].encode('ascii', 'ignore'): \ + '\'{\'scenarios\' : [' + json.dumps(scenario) + ']}\'' \ + for scenario in deserialized_scenarios} - serialized_scenarios_str = str(all_scenarios).encode('ascii', 'ignore') - with open('json_run_localhost_scenarios.bzl', 'wb') as f: - f.write('JSON_RUN_LOCALHOST_SCENARIOS = ' + serialized_scenarios_str + '\n') + serialized_scenarios_str = str(all_scenarios).encode('ascii', 'ignore') + with open('json_run_localhost_scenarios.bzl', 'wb') as f: + f.write('JSON_RUN_LOCALHOST_SCENARIOS = ' + serialized_scenarios_str + '\n') generate_args() diff --git a/test/cpp/qps/qps_json_driver_scenario_gen.py b/test/cpp/qps/qps_json_driver_scenario_gen.py index 28fbb895856..393f968a645 100755 --- a/test/cpp/qps/qps_json_driver_scenario_gen.py +++ b/test/cpp/qps/qps_json_driver_scenario_gen.py @@ -18,21 +18,21 @@ import gen_build_yaml as gen import json def generate_args(): - all_scenario_set = gen.generate_yaml() - all_scenario_set = all_scenario_set['tests'] - qps_json_driver_scenario_set = \ - [item for item in all_scenario_set if item['name'] == 'qps_json_driver'] - qps_json_driver_arg_set = \ - [item['args'][2] for item in qps_json_driver_scenario_set \ - if 'args' in item and len(item['args']) > 2] - deserialized_scenarios = [json.loads(item)['scenarios'][0] \ + all_scenario_set = gen.generate_yaml() + all_scenario_set = all_scenario_set['tests'] + qps_json_driver_scenario_set = \ + [item for item in all_scenario_set if item['name'] == 'qps_json_driver'] + qps_json_driver_arg_set = \ + [item['args'][2] for item in qps_json_driver_scenario_set \ + if 'args' in item and len(item['args']) > 2] + deserialized_scenarios = [json.loads(item)['scenarios'][0] \ for item in qps_json_driver_arg_set] - all_scenarios = {scenario['name'].encode('ascii', 'ignore'): \ + all_scenarios = {scenario['name'].encode('ascii', 'ignore'): \ '\'{\'scenarios\' : [' + json.dumps(scenario) + ']}\'' \ for scenario in deserialized_scenarios} - serialized_scenarios_str = str(all_scenarios).encode('ascii', 'ignore') - with open('qps_json_driver_scenarios.bzl', 'w') as f: - f.write('QPS_JSON_DRIVER_SCENARIOS = ' + serialized_scenarios_str + '\n') + serialized_scenarios_str = str(all_scenarios).encode('ascii', 'ignore') + with open('qps_json_driver_scenarios.bzl', 'w') as f: + f.write('QPS_JSON_DRIVER_SCENARIOS = ' + serialized_scenarios_str + '\n') generate_args() diff --git a/tools/run_tests/sanity/check_qps_scenario_changes.py b/tools/run_tests/sanity/check_qps_scenario_changes.py index 2c34251eaac..35f997a2cb3 100755 --- a/tools/run_tests/sanity/check_qps_scenario_changes.py +++ b/tools/run_tests/sanity/check_qps_scenario_changes.py @@ -27,7 +27,7 @@ qps_json_driver_bzl = 'test/cpp/qps/qps_json_driver_scenarios.bzl' json_run_localhost_bzl = 'test/cpp/qps/json_run_localhost_scenarios.bzl' if qps_json_driver_bzl in output or json_run_localhost_bzl in output: - print('qps benchmark scenarios have been updated, please commit ' + print('qps benchmark scenarios have been updated, please commit ' 'test/cpp/qps/qps_json_driver_scenarios.bzl and/or ' 'test/cpp/qps/json_run_localhost_scenarios.bzl') - sys.exit(1) + sys.exit(1)