From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 20 Feb 2013 07:55:06 +0000 (+0000)
Subject: Merge "Raising error if invalid attribute passed in."
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0589f44122ed6f734bcc0858267aa520eac68758;p=openstack-build%2Fneutron-build.git

Merge "Raising error if invalid attribute passed in."
---

0589f44122ed6f734bcc0858267aa520eac68758
diff --cc quantum/tests/unit/test_api_v2.py
index f5510058b,b1da94cf1..0256fe3b8
--- a/quantum/tests/unit/test_api_v2.py
+++ b/quantum/tests/unit/test_api_v2.py
@@@ -1127,8 -720,9 +1149,10 @@@ class SubresourceTest(unittest.TestCase
          self._plugin_patcher.stop()
          self.api = None
          self.plugin = None
 +        router.SUB_RESOURCES = {}
          cfg.CONF.reset()
+         # Restore the global RESOURCE_ATTRIBUTE_MAP
+         attributes.RESOURCE_ATTRIBUTE_MAP = self.saved_attr_map
  
      def test_index_sub_resource(self):
          instance = self.plugin.return_value