From 3a2af38f71f285122728c17c37fc3a7137dd7af7 Mon Sep 17 00:00:00 2001 From: hardik Date: Fri, 8 Apr 2016 15:55:15 +0530 Subject: [PATCH] Unblock skipped test Now bug 1383146 is fixed, we should unblock tests which was skiped due to this bug. Change-Id: I679f1f665d3213634202ec3694e784153dd8c258 --- .../tests/api/v2/test_mistral_basic_v2.py | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py b/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py index f98927b2a..b05cc4403 100644 --- a/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py +++ b/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py @@ -17,7 +17,6 @@ import six from oslo_concurrency.fixture import lockutils from oslo_log import log as logging -from tempest.lib import decorators from tempest.lib import exceptions from tempest import test @@ -811,14 +810,26 @@ class CronTriggerTestsV2(base.TestCase): self.client.create_cron_trigger, tr_name, self.wf_name, None, '5 * * * *') - @decorators.skip_because(bug="1383146") @test.attr(type='negative') def test_create_two_cron_triggers_with_same_pattern(self): - self.client.create_trigger( - 'trigger1', self.wf_name, None, '5 * * * *') - self.assertRaises(exceptions.Conflict, - self.client.create_cron_trigger, - 'trigger2', self.wf_name, None, '5 * * * *') + self.client.create_cron_trigger( + 'trigger1', + self.wf_name, + None, + '5 * * * *', + "4242-12-25 13:37", + "42" + ) + self.assertRaises( + exceptions.Conflict, + self.client.create_cron_trigger, + 'trigger2', + self.wf_name, + None, + '5 * * * *', + "4242-12-25 13:37", + "42" + ) @test.attr(type='negative') def test_invalid_cron_pattern_not_enough_params(self):