From 09f06754605d851b206edb35ebfa60d0ef8cb44d Mon Sep 17 00:00:00 2001
From: Alexander Saprykin <asaprykin@mirantis.com>
Date: Wed, 9 Mar 2016 12:19:00 +0100
Subject: [PATCH] Skip randomly failing test_deletion_during_deployment

Change-Id: I19a408910444fe73d7037c19eb62ebfe603d2294
Related-Bug: #1541005
Related-Bug: #1554319
---
 .../nailgun/test/integration/test_charset_issues.py  |  3 +++
 .../nailgun/test/integration/test_task_managers.py   | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/nailgun/nailgun/test/integration/test_charset_issues.py b/nailgun/nailgun/test/integration/test_charset_issues.py
index 69d203fb12..03c0fd0c91 100644
--- a/nailgun/nailgun/test/integration/test_charset_issues.py
+++ b/nailgun/nailgun/test/integration/test_charset_issues.py
@@ -16,6 +16,8 @@
 
 import time
 
+import unittest2
+
 from nailgun import consts
 from nailgun.db.sqlalchemy.models import Cluster
 from nailgun.test.base import BaseIntegrationTest
@@ -53,6 +55,7 @@ class TestCharsetIssues(BaseIntegrationTest):
         self.assertEqual(len(supertask.subtasks), 3)
         self.env.wait_ready(supertask)
 
+    @unittest2.skip("Randomly failing test")
     @fake_tasks()
     def test_deletion_during_deployment(self):
         self.env.create(
diff --git a/nailgun/nailgun/test/integration/test_task_managers.py b/nailgun/nailgun/test/integration/test_task_managers.py
index 9feeab366d..d8349cd92d 100644
--- a/nailgun/nailgun/test/integration/test_task_managers.py
+++ b/nailgun/nailgun/test/integration/test_task_managers.py
@@ -14,17 +14,18 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import netaddr
-import yaml
-
-import nailgun
-import nailgun.rpc as rpc
 import time
 
 import mock
+import netaddr
+import unittest2
+import yaml
 
 from sqlalchemy import sql
 
+import nailgun
+import nailgun.rpc as rpc
+
 from nailgun import consts
 from nailgun import objects
 
@@ -514,6 +515,7 @@ class TestTaskManagers(BaseIntegrationTest):
         tasks = self.db.query(models.Task).all()
         self.assertEqual(tasks, [])
 
+    @unittest2.skip("Randomly failing test")
     @fake_tasks(recover_nodes=False)
     def test_deletion_during_deployment(self):
         self.env.create(