From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 3 May 2013 05:07:22 +0000 (+0000)
Subject: Merge "Fix test_validate to run by itself"
X-Git-Tag: 2014.1~655
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a56e1cea37359810d1ce0c4cf30cb691af70c4c1;p=openstack-build%2Fheat-build.git

Merge "Fix test_validate to run by itself"
---

a56e1cea37359810d1ce0c4cf30cb691af70c4c1
diff --cc heat/tests/test_validate.py
index 265b6399,df76829d..d393a1bf
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@@ -16,8 -16,8 +16,9 @@@
  from heat.tests.v1_1 import fakes
  from heat.common import exception
  from heat.common import template_format
+ from heat.engine import resources
  from heat.engine.resources import instance as instances
 +from heat.engine import resources
  from heat.engine import service
  import heat.db.api as db_api
  from heat.engine import parser
@@@ -326,8 -267,8 +327,9 @@@ test_template_snapshot_deletion_policy 
  class validateTest(HeatTestCase):
      def setUp(self):
          super(validateTest, self).setUp()
+         resources.initialise()
          self.fc = fakes.FakeClient()
 +        resources.initialise()
          setup_dummy_db()
  
      def test_validate_volumeattach_valid(self):