From a51968d50e7cdecabaf255c26386fd82f6640cc3 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 20 Oct 2017 14:58:24 -0400 Subject: citest: show the class actual class name in results. Tests are currently run by creating a temporary subclass of each class and then executing it (in get_suites). When running the tests suite the output would contain the temporary class name. That was less than useful, and made batch runs almost impossible to identify which test case had an error. This change goes from output of: FAIL: test_no_warnings_in_log \ (tests.cloud_tests.testcases.get_suite..tmp) To FAIL: test_no_warnings_in_log \ (tests.cloud_tests.testcases.modules.ntp.TestNtp) --- tests/cloud_tests/testcases/__init__.py | 7 +++++++ tests/cloud_tests/testcases/base.py | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/cloud_tests/testcases/__init__.py b/tests/cloud_tests/testcases/__init__.py index 47217ce6..a29a0928 100644 --- a/tests/cloud_tests/testcases/__init__.py +++ b/tests/cloud_tests/testcases/__init__.py @@ -5,6 +5,7 @@ import importlib import inspect import unittest +from unittest.util import strclass from tests.cloud_tests import config from tests.cloud_tests.testcases.base import CloudTestCase as base_test @@ -37,6 +38,12 @@ def get_suite(test_name, data, conf): class tmp(test_class): + _realclass = test_class + + def __str__(self): + return "%s (%s)" % (self._testMethodName, + strclass(self._realclass)) + @classmethod def setUpClass(cls): cls.data = data diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py index b2b5b4b1..d3586e3c 100644 --- a/tests/cloud_tests/testcases/base.py +++ b/tests/cloud_tests/testcases/base.py @@ -16,10 +16,6 @@ class CloudTestCase(unittest.TestCase): conf = None _cloud_config = None - def shortDescription(self): - """Prevent nose from using docstrings.""" - return None - @property def cloud_config(self): """Get the cloud-config used by the test.""" -- cgit v1.2.3