openstack/rally-openstack
Code Issues Proposed changes

Change command return value

Browse Source 
1. rally.cliutils.run will return the error code if define, else return 1
2. task start will return 1 when test has errors or sla failed

Change-Id: Ie4ccf04b9372c2b878a945caff4576451b492aa6
This commit is contained in:
cxhuawei
2017-10-31 09:12:38 -07:00
committed by Andrey Kurilin
parent 0150bd5b50
commit e1122719d6
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/functional/test_cli_task.py
View File

@@ -40,6 +40,9 @@ class TaskTestCase(unittest.TestCase):
"type": "constant",
"times": 100,
"concurrency": 5
},
"sla": {
"failure_rate": {"max": 100}
}
}
]
@@ -123,6 +126,9 @@ class TaskTestCase(unittest.TestCase):
"type": "constant",
"times": 1,
"concurrency": 1
},
"sla": {
"failure_rate": {"max": 100}
}
}
]
@@ -699,10 +705,12 @@ class TaskTestCase(unittest.TestCase):
rally = utils.Rally()
deployment_id = utils.get_global("RALLY_DEPLOYMENT", rally.env)
config = utils.TaskConfig(cfg)
rally(("task start --task %(task_file)s "
"--deployment %(deployment_id)s --abort-on-sla-failure") %
{"task_file": config.filename,
"deployment_id": deployment_id})
self.assertRaises(utils.RallyCliError, rally,
("task start --task %(task_file)s "
"--deployment %(deployment_id)s "
"--abort-on-sla-failure") %
{"task_file": config.filename,
"deployment_id": deployment_id})
results = json.loads(rally("task results"))
self.assertEqual(1, len(results),
"Second subtask should not be started")
@@ -1060,7 +1068,11 @@ class SLATestCase(unittest.TestCase):
rally = utils.Rally()
cfg = self._get_sample_task_config(max_seconds_per_iteration=0.001)
config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename)
with self.assertRaises(utils.RallyCliError) as err:
rally("task start --task %s" % config.filename)
output = err.exception.output
self.assertIn("At least one workload did not pass SLA criteria.",
output)
self.assertRaises(utils.RallyCliError, rally, "task sla-check")
def test_sla_success(self):
@@ -1101,7 +1113,9 @@ class SLAExtraFlagsTestCase(unittest.TestCase):
}
]}
config = utils.TaskConfig(cfg)
rally("task start --task %s --abort-on-sla-failure" % config.filename)
self.assertRaises(utils.RallyCliError, rally,
"task start --task %s --abort-on-sla-failure"
% config.filename)
expected = [
{"benchmark": "Dummy.dummy_exception",
"criterion": "aborted_on_sla",
@@ -1129,11 +1143,12 @@ class SLAExtraFlagsTestCase(unittest.TestCase):
"runner": runner,
"context": {
"dummy_context": {"fail_setup": True}
}
},
}
]}
config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename)
self.assertRaises(utils.RallyCliError, rally,
"task start --task %s" % config.filename)
expected = [
{"status": "PASS",
"benchmark": "Dummy.dummy",
@@ -1195,7 +1210,11 @@ class SLAPerfDegrTestCase(unittest.TestCase):
rally = utils.Rally()
cfg = self._get_sample_task_config(max_degradation=1)
config = utils.TaskConfig(cfg)
rally("task start --task %s" % config.filename)
with self.assertRaises(utils.RallyCliError) as err:
rally("task start --task %s" % config.filename)
output = err.exception.output
self.assertIn("At least one workload did not pass SLA criteria.",
output)
self.assertRaises(utils.RallyCliError, rally, "task sla-check")
def test_sla_success(self):