Merge "Fix test_validate to run by itself"

diff --cc heat/tests/test_validate.py
index 265b6399eaed1865eb2bcc524a6042aa269d317b,df76829df0786e12f3a31b4c60427a58a9566ba3..d393a1bf8a7d9f26b66026855e866d5512e08ff4
--- 1/heat/tests/test_validate.py
--- 2/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):