openstack/rally-openstack
Code Issues Proposed changes

import new json report into rally db

Browse Source 
We have supported to export a new json report, now it is
required to import new json report into rally database.

Change-Id: Ia979354115df819ea8f6de3f301bc46ca6e13fd9
This commit is contained in:
chenhb 2017-08-24 20:14:27 +08:00 committed by Andrey Kurilin
parent 52c4a0b27b
commit 5a41c3845f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/ci/rally_gate_functions.sh
View File

@ -135,6 +135,7 @@ function run () {
rally task report --html-static --out rally-plot/results.html
gzip -9 rally-plot/results.html
rally task report --json --out rally-plot/new_results.json
rally task import --file rally-plot/new_results.json
gzip -9 rally-plot/new_results.json
rally task export --type junit-xml --to rally-plot/junit.xml
gzip -9 rally-plot/junit.xml

16
tests/functional/test_cli_task.py
View File

@ -20,6 +20,7 @@ import threading
import time
import unittest
import jsonschema
import mock
from rally import api
@ -186,6 +187,14 @@ class TaskTestCase(unittest.TestCase):
self.assertIn("Dummy.dummy_random_fail_in_atomic",
rally("task results --uuid %s" % task_uuid))
# new json report
rally("task report --json --out %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)
self.assertIn("Dummy.dummy_random_fail_in_atomic",
rally("task report --uuid %s --json" % task_uuid))
def test_abort_with_wrong_task_id(self):
rally = utils.Rally()
self.assertRaises(utils.RallyCliError,
@ -367,12 +376,9 @@ class TaskTestCase(unittest.TestCase):
results = json.loads(open(file_path).read())
self.assertIn("info", results)
self.assertIn("tasks", results)
# TODO(chenhb): We will switch to check this
# json via json schema in next patch
for task in results["tasks"]:
self.assertIn("subtasks", task)
for subtask in task["subtasks"]:
self.assertIn("workloads", subtask)
jsonschema.validate(task,
api._Task.TASK_SCHEMA)
def test_report_one_uuid_with_json(self):
rally = utils.Rally()