openinfra/refstack
Code Issues Proposed changes

Minor fixes for subunit processing code.

Browse Source 
Fix the FAILURE status mapping in subunit processing code.
Workaround the inconsitent format for setupClass failures.

Change-Id: I026589739f2ec339514deab5df4239db511a536c
This commit is contained in:
Raymond Wong
2014-04-08 17:18:47 -07:00
parent a2c119a1a3
commit 1e31b63785
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
refstack/templates/show_report.html
View File

@@ -43,7 +43,7 @@
</tr>
{% for classname, testcases in test_result['data'].items() %}
<tr>
<td class="report_data_path" colspan=3 style="text-align:left"><b>Test class:</b> {{ classname }}</td>
<td class="report_data_path" colspan=3 style="text-align:left"><b>Test Group:</b> {{ classname }}</td>
</tr>
{% for testcase in testcases %}
<tr>

25
refstack/tools/tempest_subunit_test_result.py
View File

@@ -15,6 +15,7 @@
# under the License.
import re
import subunit
import testtools
import unittest
@@ -108,16 +109,22 @@ class TempestSubunitTestResult(TempestSubunitTestResultBase):
def _process_result(self, result_type, testcase, *arg):
"""Process and append data to dictionary objects."""
testcase_id = testcase.id()
elapsed = (self._now() - self.start_time).total_seconds()
status = result_type
# Convert "SUCCESS" to "PASS"
# Separate "FAILURE" into "FAIL" and "FAIL_SETUP"
status = result_type
if status == self.result_type[0]:
status = self.status[0]
if (status == self.status[1]) and ("setUpClass" in testcase_id):
status = self.status[3]
elif status == self.result_type[1]:
if "setUpClass" in testcase_id:
status = self.status[2]
testcase_id = '%s.setUpClass' % \
(re.search('\((.*)\)', testcase_id).group(1))
else:
status = self.status[1]
self.results.setdefault(testcase_id, [])
self.results[testcase_id] = [status, elapsed]
@@ -146,16 +153,22 @@ class TempestSubunitTestResultTuples(TempestSubunitTestResult):
def _process_result(self, result_type, testcase, *arg):
"""Process and append data to dictionary objects."""
testcase_id = testcase.id()
elapsed = round((self._now() - self.start_time).total_seconds(), 2)
status = result_type
# Convert "SUCCESS" to "PASS"
# Separate "FAILURE" into "FAIL" and "FAIL_SETUP"
status = result_type
if status == self.result_type[0]:
status = self.status[0]
if (status == self.status[1]) and ("setUpClass" in testcase_id):
status = self.status[3]
elif status == self.result_type[1]:
if "setUpClass" in testcase_id:
status = self.status[2]
testcase_id = '%s.setUpClass' % \
(re.search('\((.*)\)', testcase_id).group(1))
else:
status = self.status[1]
classname, testname = testcase_id.rsplit('.', 1)