openstack/rally-openstack
Code Issues Proposed changes

[testing] Refactor CLI tests and utils

Browse Source 
* Make hook tests pass on any platform
* Fix Task Import tests (not sure why they worked before)
* Reduce the time required to run tests
* Use getjson where suitable
* Use no_logs where logs may cause problems

Change-Id: Iae927760152c2e1ca2a4622762b33a57f1070945
This commit is contained in:
Boris Pavlovic 2018-02-14 21:17:02 -08:00
parent 30733d4194
commit 626108defd
3 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/functional/test_cli_deployment.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
import re import re
import unittest import unittest
@ -79,14 +78,13 @@ class DeploymentTestCase(unittest.TestCase):
rally = utils.Rally() rally = utils.Rally()
rally.env.update(TEST_ENV) rally.env.update(TEST_ENV)
rally("deployment create --name t_create_env --fromenv") rally("deployment create --name t_create_env --fromenv")
config = json.loads(rally("deployment config")) config = rally("deployment config", getjson=True)
config["openstack"]["admin"]["password"] = "fakepassword" config["openstack"]["admin"]["password"] = "fakepassword"
file = utils.JsonTempFile(config) file = utils.JsonTempFile(config)
rally("deployment create --name t_create_file_debug " rally("deployment create --name t_create_file_debug "
"--filename %s" % file.filename) "--filename %s" % file.filename)
self.assertIn("t_create_file_debug", rally("deployment list")) self.assertIn("t_create_file_debug", rally("deployment list"))
self.assertEqual(config, self.assertEqual(config, rally("deployment config", getjson=True))
json.loads(rally("deployment config")))
self.assertRaises(utils.RallyCliError, rally, "deployment check") self.assertRaises(utils.RallyCliError, rally, "deployment check")
try: try:
@ -129,7 +127,7 @@ class DeploymentTestCase(unittest.TestCase):
rally = utils.Rally() rally = utils.Rally()
rally.env.update(TEST_ENV) rally.env.update(TEST_ENV)
rally("deployment create --name t_create_env --fromenv") rally("deployment create --name t_create_env --fromenv")
config = json.loads(rally("deployment config")) config = rally("deployment config", getjson=True)
self.assertIn("openstack", config) self.assertIn("openstack", config)
self.assertEqual(TEST_ENV["OS_USERNAME"], self.assertEqual(TEST_ENV["OS_USERNAME"],
config["openstack"]["admin"]["username"]) config["openstack"]["admin"]["username"])

87
tests/functional/test_cli_task.py
View File

@ -38,7 +38,7 @@ class TaskTestCase(unittest.TestCase):
{ {
"runner": { "runner": {
"type": "constant", "type": "constant",
"times": 100, "times": 20,
"concurrency": 5 "concurrency": 5
}, },
"sla": { "sla": {
@ -186,17 +186,15 @@ class TaskTestCase(unittest.TestCase):
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
json_report = rally.gen_report_path(extension="json") json_report = rally.gen_report_path(extension="json")
with open(json_report, "w+") as f: with open(json_report, "w+") as f:
f.write(rally("task results")) f.write(rally("task results", no_logs=True))
import_print = rally("task import --file %s" % json_report) import_print = rally("task import --file %s" % json_report)
self.assertIn("successfully", import_print)
task_uuid = re.search("UUID:\s([a-z0-9\-]+)", import_print).group(1) task_uuid = re.search("UUID:\s([a-z0-9\-]+)", import_print).group(1)
self.assertIn("Dummy.dummy_random_fail_in_atomic", self.assertIn("Dummy.dummy_random_fail_in_atomic",
rally("task results --uuid %s" % task_uuid)) rally("task results --uuid %s" % task_uuid))
# new json report # new json report
rally("task report --json --out %s" % json_report) rally("task report --json --out %s" % json_report, no_logs=True)
import_print = rally("task import --file %s" % json_report) import_print = rally("task import --file %s" % json_report)
self.assertIn("successfully", import_print)
task_uuid = re.search("UUID:\s([a-z0-9\-]+)", import_print).group(1) task_uuid = re.search("UUID:\s([a-z0-9\-]+)", import_print).group(1)
self.assertIn("Dummy.dummy_random_fail_in_atomic", self.assertIn("Dummy.dummy_random_fail_in_atomic",
rally("task report --uuid %s --json" % task_uuid)) rally("task report --uuid %s --json" % task_uuid))
@ -252,7 +250,7 @@ class TaskTestCase(unittest.TestCase):
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
html_report = rally.gen_report_path(extension="html") html_report = rally.gen_report_path(extension="html")
rally("task report --out %s" % html_report) rally("task report --out %s" % html_report, no_logs=True)
self.assertTrue(os.path.exists(html_report)) self.assertTrue(os.path.exists(html_report))
self._assert_html_report_libs_are_embedded(html_report, False) self._assert_html_report_libs_are_embedded(html_report, False)
self.assertRaises(utils.RallyCliError, self.assertRaises(utils.RallyCliError,
@ -282,7 +280,7 @@ class TaskTestCase(unittest.TestCase):
files.append(path) files.append(path)
if os.path.exists(path): if os.path.exists(path):
os.remove(path) os.remove(path)
rally("task results", report_path=path, raw=True) rally("task results", report_path=path, raw=True, no_logs=True)
html_report = rally.gen_report_path(extension="html") html_report = rally.gen_report_path(extension="html")
rally("task report --uuid %s --out %s" % ( rally("task report --uuid %s --out %s" % (
@ -299,7 +297,7 @@ class TaskTestCase(unittest.TestCase):
if os.path.exists(task_result_file): if os.path.exists(task_result_file):
os.remove(task_result_file) os.remove(task_result_file)
rally("task results", report_path=task_result_file, rally("task results", report_path=task_result_file,
raw=True) raw=True, no_logs=True)
task_run_output = rally( task_run_output = rally(
"task start --task %s" % config.filename) "task start --task %s" % config.filename)
@ -308,7 +306,7 @@ class TaskTestCase(unittest.TestCase):
html_report = rally.gen_report_path(extension="html") html_report = rally.gen_report_path(extension="html")
rally("task report --uuid" rally("task report --uuid"
" %s %s --out %s" % (task_result_file, task_uuid, " %s %s --out %s" % (task_result_file, task_uuid,
html_report)) html_report), no_logs=True)
self.assertTrue(os.path.exists(html_report)) self.assertTrue(os.path.exists(html_report))
self.assertRaises(utils.RallyCliError, self.assertRaises(utils.RallyCliError,
rally, "task report --report %s" % FAKE_TASK_UUID) rally, "task report --report %s" % FAKE_TASK_UUID)
@ -327,7 +325,7 @@ class TaskTestCase(unittest.TestCase):
html_report = rally.gen_report_path(extension="html") html_report = rally.gen_report_path(extension="html")
rally("task report --html-static %s --out %s" rally("task report --html-static %s --out %s"
% (task_result_file, html_report)) % (task_result_file, html_report), no_logs=True)
self.assertTrue(os.path.exists(html_report)) self.assertTrue(os.path.exists(html_report))
self._assert_html_report_libs_are_embedded(html_report) self._assert_html_report_libs_are_embedded(html_report)
@ -337,7 +335,7 @@ class TaskTestCase(unittest.TestCase):
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
html_report = rally.gen_report_path(extension="html") html_report = rally.gen_report_path(extension="html")
rally("task report --out %s --html-static" % html_report) rally("task report --out %s --html-static" % html_report, no_logs=True)
self.assertTrue(os.path.exists(html_report)) self.assertTrue(os.path.exists(html_report))
self._assert_html_report_libs_are_embedded(html_report) self._assert_html_report_libs_are_embedded(html_report)
@ -355,7 +353,7 @@ class TaskTestCase(unittest.TestCase):
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
json_report = rally.gen_report_path(extension="json") json_report = rally.gen_report_path(extension="json")
rally("task report --out %s --json" % json_report) rally("task report --out %s --json" % json_report, no_logs=True)
self.assertTrue(os.path.exists(json_report)) self.assertTrue(os.path.exists(json_report))
self._assert_json_report(json_report) self._assert_json_report(json_report)
@ -369,7 +367,7 @@ class TaskTestCase(unittest.TestCase):
task_uuids.append(self._get_task_uuid(res)) task_uuids.append(self._get_task_uuid(res))
json_report = rally.gen_report_path(extension="json") json_report = rally.gen_report_path(extension="json")
rally("task report --json --uuid %s --out %s" rally("task report --json --uuid %s --out %s"
% (" ".join(task_uuids), json_report)) % (" ".join(task_uuids), json_report), no_logs=True)
self.assertTrue(os.path.exists(json_report)) self.assertTrue(os.path.exists(json_report))
self._assert_json_report(json_report) self._assert_json_report(json_report)
@ -425,11 +423,13 @@ class TaskTestCase(unittest.TestCase):
rally("task start --task %s --tag trends_run run_once" % rally("task start --task %s --tag trends_run run_once" %
config2.filename) config2.filename)
tasks_list = rally("task list --uuids-only --tag trends_run") tasks_list = rally("task list --uuids-only --tag trends_run",
no_logs=True)
uuids = [u for u in tasks_list.split("\n") if u] uuids = [u for u in tasks_list.split("\n") if u]
rally("task trends %(uuids)s --out %(report)s" rally("task trends %(uuids)s --out %(report)s"
% {"uuids": " ".join(uuids), "report": report}) % {"uuids": " ".join(uuids), "report": report},
no_logs=True)
del config1, config2 del config1, config2
self.assertTrue(os.path.exists(report)) self.assertTrue(os.path.exists(report))
@ -598,7 +598,7 @@ class TaskTestCase(unittest.TestCase):
"--deployment %(deployment_id)s --abort-on-sla-failure") % "--deployment %(deployment_id)s --abort-on-sla-failure") %
{"task_file": config.filename, {"task_file": config.filename,
"deployment_id": deployment_id}) "deployment_id": deployment_id})
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
iterations_completed = len(results[0]["result"]) iterations_completed = len(results[0]["result"])
self.assertEqual(times, iterations_completed) self.assertEqual(times, iterations_completed)
@ -674,7 +674,7 @@ class TaskTestCase(unittest.TestCase):
"--abort-on-sla-failure") % "--abort-on-sla-failure") %
{"task_file": config.filename, {"task_file": config.filename,
"deployment_id": deployment_id}) "deployment_id": deployment_id})
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
self.assertEqual(1, len(results), self.assertEqual(1, len(results),
"Second subtask should not be started") "Second subtask should not be started")
iterations_completed = len(results[0]["result"]) iterations_completed = len(results[0]["result"])
@ -904,14 +904,14 @@ class TaskTestCase(unittest.TestCase):
rally, cfg, "test_abort-thread_with_abort.txt") rally, cfg, "test_abort-thread_with_abort.txt")
rally("task abort %s" % uuid) rally("task abort %s" % uuid)
task.join() task.join()
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
iterations_completed = len(results[0]["result"]) iterations_completed = len(results[0]["result"])
# NOTE(msdubov): check that the task is really stopped before # NOTE(msdubov): check that the task is really stopped before
# the specified number of iterations # the specified number of iterations
self.assertLess(iterations_completed, RUNNER_TIMES) self.assertLess(iterations_completed, RUNNER_TIMES)
self.assertIn("aborted", rally("task status")) self.assertIn("aborted", rally("task status"))
report = rally.gen_report_path(extension="html") report = rally.gen_report_path(extension="html")
rally("task report --out %s" % report) rally("task report --out %s" % report, no_logs=True)
def test_abort_soft(self): def test_abort_soft(self):
cfg = { cfg = {
@ -938,7 +938,7 @@ class TaskTestCase(unittest.TestCase):
rally, cfg, "test_abort_soft-thread_with_soft_abort.txt") rally, cfg, "test_abort_soft-thread_with_soft_abort.txt")
rally("task abort --soft") rally("task abort --soft")
task.join() task.join()
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
iterations_completed = len(results[0]["result"]) iterations_completed = len(results[0]["result"])
self.assertEqual(3, iterations_completed) self.assertEqual(3, iterations_completed)
self.assertEqual(1, len(results)) self.assertEqual(1, len(results))
@ -978,16 +978,18 @@ class TaskTestCase(unittest.TestCase):
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
html_report = rally.gen_report_path(extension="html") html_report = rally.gen_report_path(extension="html")
rally("task export --type html --to %s" % html_report) rally("task export --type html --to %s" % html_report, no_logs=True)
self.assertTrue(os.path.exists(html_report)) self.assertTrue(os.path.exists(html_report))
self._assert_html_report_libs_are_embedded(html_report, False) self._assert_html_report_libs_are_embedded(html_report, False)
rally("task export --type html-static --to %s" % html_report) rally("task export --type html-static --to %s" % html_report,
no_logs=True)
self.assertTrue(os.path.exists(html_report)) self.assertTrue(os.path.exists(html_report))
self._assert_html_report_libs_are_embedded(html_report) self._assert_html_report_libs_are_embedded(html_report)
junit_report = rally.gen_report_path(extension="junit") junit_report = rally.gen_report_path(extension="junit")
rally("task export --type junit-xml --to %s" % junit_report) rally("task export --type junit-xml --to %s" % junit_report,
no_logs=True)
self.assertTrue(os.path.exists(junit_report)) self.assertTrue(os.path.exists(junit_report))
def test_export_bunch_uuids(self): def test_export_bunch_uuids(self):
@ -1053,7 +1055,7 @@ class SLATestCase(unittest.TestCase):
"detail": mock.ANY, "detail": mock.ANY,
"pos": 0, "status": "PASS"} "pos": 0, "status": "PASS"}
] ]
data = rally("task sla-check --json", getjson=True) data = rally("task sla-check --json", getjson=True, no_logs=True)
self.assertEqual(expected, data) self.assertEqual(expected, data)
@ -1272,12 +1274,12 @@ class HookTestCase(unittest.TestCase):
def test_hook_result_with_constant_runner(self): def test_hook_result_with_constant_runner(self):
rally = utils.Rally() rally = utils.Rally()
cfg = self._get_sample_task_config( cfg = self._get_sample_task_config(
cmd="/bin/true", cmd="true",
description="event_hook", description="event_hook",
runner={"constant": {"times": 10, "concurrency": 3}}) runner={"constant": {"times": 10, "concurrency": 3}})
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
hook_results = results[0]["hooks"] hook_results = results[0]["hooks"]
hooks_cfg = cfg["subtasks"][0]["hooks"] hooks_cfg = cfg["subtasks"][0]["hooks"]
expected = [self._get_result(hooks_cfg[0], iterations=[5])] expected = [self._get_result(hooks_cfg[0], iterations=[5])]
@ -1287,13 +1289,13 @@ class HookTestCase(unittest.TestCase):
def test_hook_result_with_constant_for_duration_runner(self): def test_hook_result_with_constant_for_duration_runner(self):
rally = utils.Rally() rally = utils.Rally()
cfg = self._get_sample_task_config( cfg = self._get_sample_task_config(
cmd="/bin/true", cmd="true",
description="event_hook", description="event_hook",
runner={"constant_for_duration": { runner={"constant_for_duration": {
"concurrency": 3, "duration": 10}}) "concurrency": 3, "duration": 10}})
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
hook_results = results[0]["hooks"] hook_results = results[0]["hooks"]
hooks_cfg = cfg["subtasks"][0]["hooks"] hooks_cfg = cfg["subtasks"][0]["hooks"]
expected = [self._get_result(hooks_cfg[0], iterations=[5])] expected = [self._get_result(hooks_cfg[0], iterations=[5])]
@ -1303,12 +1305,12 @@ class HookTestCase(unittest.TestCase):
def test_hook_result_with_rps_runner(self): def test_hook_result_with_rps_runner(self):
rally = utils.Rally() rally = utils.Rally()
cfg = self._get_sample_task_config( cfg = self._get_sample_task_config(
cmd="/bin/true", cmd="true",
description="event_hook", description="event_hook",
runner={"rps": {"rps": 3, "times": 10}}) runner={"rps": {"rps": 3, "times": 10}})
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
hook_results = results[0]["hooks"] hook_results = results[0]["hooks"]
hooks_cfg = cfg["subtasks"][0]["hooks"] hooks_cfg = cfg["subtasks"][0]["hooks"]
expected = [self._get_result(hooks_cfg[0], iterations=[5])] expected = [self._get_result(hooks_cfg[0], iterations=[5])]
@ -1318,12 +1320,12 @@ class HookTestCase(unittest.TestCase):
def test_hook_result_with_serial_runner(self): def test_hook_result_with_serial_runner(self):
rally = utils.Rally() rally = utils.Rally()
cfg = self._get_sample_task_config( cfg = self._get_sample_task_config(
cmd="/bin/true", cmd="true",
description="event_hook", description="event_hook",
runner={"serial": {"times": 10}}) runner={"serial": {"times": 10}})
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
hook_results = results[0]["hooks"] hook_results = results[0]["hooks"]
hooks_cfg = cfg["subtasks"][0]["hooks"] hooks_cfg = cfg["subtasks"][0]["hooks"]
expected = [self._get_result(hooks_cfg[0], iterations=[5])] expected = [self._get_result(hooks_cfg[0], iterations=[5])]
@ -1333,12 +1335,12 @@ class HookTestCase(unittest.TestCase):
def test_hook_result_error(self): def test_hook_result_error(self):
rally = utils.Rally() rally = utils.Rally()
cfg = self._get_sample_task_config( cfg = self._get_sample_task_config(
cmd="/bin/false", cmd="false",
description="event_hook", description="event_hook",
runner={"constant": {"times": 20, "concurrency": 3}}) runner={"constant": {"times": 20, "concurrency": 3}})
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
hook_results = results[0]["hooks"] hook_results = results[0]["hooks"]
hooks_cfg = cfg["subtasks"][0]["hooks"] hooks_cfg = cfg["subtasks"][0]["hooks"]
expected = [self._get_result(hooks_cfg[0], iterations=[5], error=True)] expected = [self._get_result(hooks_cfg[0], iterations=[5], error=True)]
@ -1348,29 +1350,29 @@ class HookTestCase(unittest.TestCase):
def test_time_hook(self): def test_time_hook(self):
rally = utils.Rally() rally = utils.Rally()
cfg = self._get_sample_task_config( cfg = self._get_sample_task_config(
cmd="/bin/true", cmd="true",
description="event_hook", description="event_hook",
runner={"constant_for_duration": runner={"constant_for_duration":
{"concurrency": 3, "duration": 10}}) {"concurrency": 3, "duration": 5}})
cfg["subtasks"][0]["hooks"].append({ cfg["subtasks"][0]["hooks"].append({
"description": "time_hook", "description": "time_hook",
"action": {"sys_call": "/bin/true"}, "action": {"sys_call": "true"},
"trigger": { "trigger": {
"event": { "event": {
"unit": "time", "unit": "time",
"at": [3, 6, 9], "at": [1, 2, 3],
} }
} }
}) })
config = utils.TaskConfig(cfg) config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
results = json.loads(rally("task results")) results = rally("task results", getjson=True)
hook_results = results[0]["hooks"] hook_results = results[0]["hooks"]
hooks_cfg = cfg["subtasks"][0]["hooks"] hooks_cfg = cfg["subtasks"][0]["hooks"]
expected = [self._get_result(hooks_cfg[0], iterations=[5]), expected = [self._get_result(hooks_cfg[0], iterations=[5]),
self._get_result(hooks_cfg[1], seconds=[3, 6, 9])] self._get_result(hooks_cfg[1], seconds=[1, 2, 3])]
self.assertEqual( self.assertEqual(
expected, expected,
sorted(hook_results, sorted(hook_results,
@ -1381,7 +1383,7 @@ class HookTestCase(unittest.TestCase):
def test_import_hook_result(self): def test_import_hook_result(self):
rally = utils.Rally() rally = utils.Rally()
cfg = self._get_sample_task_config( cfg = self._get_sample_task_config(
cmd="/bin/true", cmd="true",
description="event_hook", description="event_hook",
runner={"constant": {"times": 10, "concurrency": 3}}) runner={"constant": {"times": 10, "concurrency": 3}})
cfg["subtasks"][0]["hooks"].extend( cfg["subtasks"][0]["hooks"].extend(
@ -1412,9 +1414,8 @@ class HookTestCase(unittest.TestCase):
rally("task start --task %s" % config.filename) rally("task start --task %s" % config.filename)
json_report = rally.gen_report_path(extension="json") json_report = rally.gen_report_path(extension="json")
with open(json_report, "w+") as f: with open(json_report, "w+") as f:
f.write(rally("task results")) f.write(rally("task results", no_logs=True))
import_print = rally("task import --file %s" % json_report) import_print = rally("task import --file %s" % json_report)
self.assertIn("successfully", import_print)
task_uuid = re.search("UUID:\s([a-z0-9\-]+)", import_print).group(1) task_uuid = re.search("UUID:\s([a-z0-9\-]+)", import_print).group(1)
results = rally("task results --uuid %s" % task_uuid) results = rally("task results --uuid %s" % task_uuid)
self.assertIn("Dummy.dummy", results) self.assertIn("Dummy.dummy", results)

15
tests/functional/utils.py
View File

@ -72,7 +72,7 @@ class Rally(object):
""" """
_DEPLOYMENT_CREATE_ARGS = "" _DEPLOYMENT_CREATE_ARGS = ""
def __init__(self, force_new_db=False): def __init__(self, force_new_db=False, plugin_path=None):
# NOTE(sskripnick): we should change home dir to avoid races # NOTE(sskripnick): we should change home dir to avoid races
# and do not touch any user files in ~/.rally # and do not touch any user files in ~/.rally
@ -111,6 +111,8 @@ class Rally(object):
self.args = ["rally"] self.args = ["rally"]
subprocess.call(["rally", "db", "recreate"], env=self.env) subprocess.call(["rally", "db", "recreate"], env=self.env)
if plugin_path:
self.args.extend(["--plugin-paths", os.path.abspath(plugin_path)])
self.reports_root = os.environ.get("REPORTS_ROOT", self.reports_root = os.environ.get("REPORTS_ROOT",
"rally-cli-output-files") "rally-cli-output-files")
self._created_files = [] self._created_files = []
@ -169,7 +171,7 @@ class Rally(object):
def __call__(self, cmd, getjson=False, report_path=None, raw=False, def __call__(self, cmd, getjson=False, report_path=None, raw=False,
suffix=None, extension=None, keep_old=False, suffix=None, extension=None, keep_old=False,
write_report=True): write_report=True, no_logs=False):
"""Call rally in the shell """Call rally in the shell
:param cmd: rally command :param cmd: rally command
@ -189,8 +191,13 @@ class Rally(object):
else: else:
cmd = self.args + cmd cmd = self.args + cmd
output = encodeutils.safe_decode(subprocess.check_output( if no_logs:
cmd, stderr=subprocess.STDOUT, env=self.env)) with open(os.devnull, "w") as DEVNULL:
output = encodeutils.safe_decode(subprocess.check_output(
cmd, stderr=DEVNULL, env=self.env))
else:
output = encodeutils.safe_decode(subprocess.check_output(
cmd, stderr=subprocess.STDOUT, env=self.env))
if getjson: if getjson:
return json.loads(output) return json.loads(output)