From: Thomas Herve <therve@gmail.com>
Date: Wed, 22 May 2013 08:23:50 +0000 (+0200)
Subject: Remove unrelated tracebacks from test output
X-Git-Tag: 2014.1~575
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=14354874dec15ce148489cdd85420c6334a6e5fc;p=openstack-build%2Fheat-build.git

Remove unrelated tracebacks from test output

This mocks some calls the ThreadGroup when testing update and delete of
the stack, resulting in tracebacks when the threads randomly run later
on in the test suite.

Change-Id: Ia1a376933c2e25b6cf0fe6a26f47e381cbb1a55e
Fixes: bug #1182285
---

diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index c259155d..c92a3d33 100644
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -293,6 +293,8 @@ class stackServiceCreateUpdateDeleteTest(HeatTestCase):
 
         parser.Stack.load(self.ctx, stack=s).AndReturn(stack)
 
+        self.man.tg = DummyThreadGroup()
+
         self.m.ReplayAll()
 
         self.assertEqual(self.man.delete_stack(self.ctx, stack.identifier()),
@@ -338,6 +340,9 @@ class stackServiceCreateUpdateDeleteTest(HeatTestCase):
         self.m.StubOutWithMock(stack, 'validate')
         stack.validate().AndReturn(None)
 
+        self.m.StubOutWithMock(threadgroup, 'ThreadGroup')
+        threadgroup.ThreadGroup().AndReturn(DummyThreadGroup())
+
         self.m.ReplayAll()
 
         result = self.man.update_stack(self.ctx, old_stack.identifier(),