From 86c0f73ed3afaad916877ed33f2857f506ae469c Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Wed, 11 Jun 2014 13:57:36 +1000 Subject: [PATCH] Move all tests to use base.BaseTest This is so it will be easier to change to oslotest so we can get stderr/logging output from testr. Change-Id: Ifc03433ec2a086635cd27f417d97447141139e7b --- mistral/tests/unit/actions/test_std_email_action.py | 3 ++- mistral/tests/unit/test_expressions.py | 6 ++---- mistral/tests/unit/workbook/test_get_on_state.py | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mistral/tests/unit/actions/test_std_email_action.py b/mistral/tests/unit/actions/test_std_email_action.py index db6d391bc..1279e9222 100644 --- a/mistral/tests/unit/actions/test_std_email_action.py +++ b/mistral/tests/unit/actions/test_std_email_action.py @@ -23,6 +23,7 @@ from email.parser import Parser from mistral.actions import std_actions as std from mistral import exceptions as exc +from mistral.tests import base """ To try against a real SNMP server: @@ -47,7 +48,7 @@ LOCAL_SMTPD = False REMOTE_SMTP = False -class SendEmailActionTest(unittest2.TestCase): +class SendEmailActionTest(base.BaseTest): def setUp(self): self.params = { diff --git a/mistral/tests/unit/test_expressions.py b/mistral/tests/unit/test_expressions.py index 5f627d656..3665a7b38 100644 --- a/mistral/tests/unit/test_expressions.py +++ b/mistral/tests/unit/test_expressions.py @@ -14,10 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import unittest2 - from mistral import expressions as expr - +from mistral.tests import base DATA = { "server": { @@ -43,7 +41,7 @@ SERVERS = { } -class YaqlEvaluatorTest(unittest2.TestCase): +class YaqlEvaluatorTest(base.BaseTest): def setUp(self): super(YaqlEvaluatorTest, self).setUp() self._evaluator = expr.YAQLEvaluator() diff --git a/mistral/tests/unit/workbook/test_get_on_state.py b/mistral/tests/unit/workbook/test_get_on_state.py index f2d1afacc..ab1f782c2 100644 --- a/mistral/tests/unit/workbook/test_get_on_state.py +++ b/mistral/tests/unit/workbook/test_get_on_state.py @@ -22,12 +22,11 @@ SAMPLE_TASK_SPEC = { 'on-error': ["task1", "task2"] } -import unittest2 - +from mistral.tests import base from mistral.workbook import tasks -class GetOnStateTest(unittest2.TestCase): +class GetOnStateTest(base.BaseTest): def setUp(self): self.task = tasks.TaskSpec(SAMPLE_TASK_SPEC)