Merge "Releasing resources of context manager functions if exceptions occur"

diff --cc quantum/tests/unit/test_l3_plugin.py
index 1e0bb8fc1fe512998c3ad63e1197d6d41d537dde,3589a06303eda9a4c787fa541fe46e2759211ead..ddc807caf19edf0e4a2cd09024ba73de25d0081a
--- 1/quantum/tests/unit/test_l3_plugin.py
--- 2/quantum/tests/unit/test_l3_plugin.py
+++ b/quantum/tests/unit/test_l3_plugin.py
@@@ -332,24 -336,30 +336,24 @@@ class L3NatDBTestCase(test_db_plugin.Qu
      @contextlib.contextmanager
      def router(self, name='router1', admin_status_up=True,
                 fmt='json', tenant_id=_uuid()):
-         res = self._create_router(fmt, tenant_id, name=name,
-                                   admin_state_up=admin_status_up)
-         router = self.deserialize(fmt, res)
-         yield router
-         self._delete('routers', router['router']['id'])
+         router = self._make_router(fmt, tenant_id, name, admin_status_up)
+         try:
+             yield router
+         finally:
+             self._delete('routers', router['router']['id'])
  
 -    def test_router_crd_ops(self):
 -        with self.router() as r:
 -            body = self._list('routers')
 -            self.assertEquals(len(body['routers']), 1)
 -            self.assertEquals(body['routers'][0]['id'], r['router']['id'])
 -
 -            body = self._show('routers', r['router']['id'])
 -            self.assertEquals(body['router']['id'], r['router']['id'])
 -            self.assertEquals(body['router']['external_gateway_info'], None)
 -
 -        # post-delete, check that it is really gone
 -        body = self._list('routers')
 -        self.assertEquals(len(body['routers']), 0)
 -
 -        body = self._show('routers', r['router']['id'],
 -                          expected_code=exc.HTTPNotFound.code)
 -
 -    def test_create_router_with_gwinfo(self):
 +    def test_router_create(self):
 +        name = 'router1'
 +        tenant_id = _uuid()
 +        expected_value = [('name', name), ('tenant_id', tenant_id),
 +                          ('admin_state_up', True), ('status', 'ACTIVE'),
 +                          ('external_gateway_info', None)]
 +        with self.router(name='router1', admin_status_up=True,
 +                         tenant_id=tenant_id) as router:
 +            for k, v in expected_value:
 +                self.assertEqual(router['router'][k], v)
 +
 +    def test_router_create_with_gwinfo(self):
          with self.subnet() as s:
              self._set_net_external(s['subnet']['network_id'])
              data = {'router': {'tenant_id': _uuid()}}