From 60a8d96fb880ea5f520f27a42a01dba5f6cc3b4d Mon Sep 17 00:00:00 2001
From: Renat Akhmerov <renat.akhmerov@gmail.com>
Date: Wed, 6 Apr 2016 11:08:48 +0700
Subject: [PATCH] Unblock skipped tests in test_action_defaults.py
* It now makes sense because https://bugs.launchpad.net/mistral/+bug/1517020
is closed.
Change-Id: I9294ef9254df7015202926685da6cf8d670eaa57
---
mistral/tests/unit/engine/test_action_defaults.py | 6 ------
1 file changed, 6 deletions(-)
diff --git a/mistral/tests/unit/engine/test_action_defaults.py b/mistral/tests/unit/engine/test_action_defaults.py
index 9869fb8df..cf32db277 100644
--- a/mistral/tests/unit/engine/test_action_defaults.py
+++ b/mistral/tests/unit/engine/test_action_defaults.py
@@ -15,8 +15,6 @@
import mock
from oslo_config import cfg
import requests
-import six
-import testtools
from mistral.actions import std_actions
from mistral.db.v2 import api as db_api
@@ -98,7 +96,6 @@ wf2_with_items:
class ActionDefaultTest(base.EngineTestCase):
- @testtools.skipIf(six.PY3, "bug/1517020")
@mock.patch.object(
requests, 'request',
mock.MagicMock(return_value=test_base.FakeHTTPResponse('', 200, 'OK')))
@@ -124,7 +121,6 @@ class ActionDefaultTest(base.EngineTestCase):
auth=EXPECTED_ENV_AUTH,
timeout=ENV['__actions']['std.http']['timeout'])
- @testtools.skipIf(six.PY3, "bug/1517020")
@mock.patch.object(
requests, 'request',
mock.MagicMock(return_value=test_base.FakeHTTPResponse('', 200, 'OK')))
@@ -157,7 +153,6 @@ class ActionDefaultTest(base.EngineTestCase):
@mock.patch.object(
std_actions.HTTPAction, 'is_sync',
mock.MagicMock(return_value=True))
- @testtools.skip("Fix 'with-items'.")
def test_with_items_action_defaults_from_env(self):
wf_service.create_workflows(WORKFLOW1_WITH_ITEMS)
@@ -196,7 +191,6 @@ class ActionDefaultTest(base.EngineTestCase):
@mock.patch.object(
std_actions.HTTPAction, 'is_sync',
mock.MagicMock(return_value=True))
- @testtools.skip("Fix 'with-items'.")
def test_with_items_action_defaults_from_env_not_applied(self):
wf_service.create_workflows(WORKFLOW2_WITH_ITEMS)