Merge "Skip randomly failing test_deletion_during_deployment"

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(

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(