From 1daadb9c12bdf8ceb37176db3c524b0c5d03bf2c Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Fri, 9 Aug 2013 17:25:58 +0400 Subject: [PATCH] Get rid of unused greenlet things in test_resource Removing useless test cases containing greenlet.GreenletExit for the sake of 56d5fb9f83b647d27a00d56cb4dad8aad9e1169f Change-Id: I6a1463c8467ee1750a66b00758428bc74f9371eb --- heat/tests/test_resource.py | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index 0e6bc890..5bc09cda 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -13,7 +13,6 @@ # under the License. import itertools -from eventlet.support import greenlets as greenlet from heat.common import exception from heat.engine import parser @@ -421,38 +420,6 @@ class ResourceTest(HeatTestCase): resume = scheduler.TaskRunner(res.resume) self.assertRaises(exception.ResourceFailure, resume) - def test_suspend_fail_exit(self): - tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} - res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack) - scheduler.TaskRunner(res.create)() - self.assertEqual((res.CREATE, res.COMPLETE), res.state) - - self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_suspend') - generic_rsrc.GenericResource.handle_suspend().AndRaise( - greenlet.GreenletExit()) - self.m.ReplayAll() - - suspend = scheduler.TaskRunner(res.suspend) - self.assertRaises(greenlet.GreenletExit, suspend) - self.assertEqual((res.SUSPEND, res.FAILED), res.state) - - def test_resume_fail_exit(self): - tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} - res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack) - scheduler.TaskRunner(res.create)() - self.assertEqual((res.CREATE, res.COMPLETE), res.state) - - self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_resume') - generic_rsrc.GenericResource.handle_resume().AndRaise( - greenlet.GreenletExit()) - self.m.ReplayAll() - - res.state_set(res.SUSPEND, res.COMPLETE) - - resume = scheduler.TaskRunner(res.resume) - self.assertRaises(greenlet.GreenletExit, resume) - self.assertEqual((res.RESUME, res.FAILED), res.state) - def test_suspend_fail_exception(self): tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack) -- 2.45.2