Skipping the import if its deps aren't installed, use --no-skip if you want to run...

diff --git a/heat/tests/test_cfn.py b/heat/tests/test_cfn.py
index bdbf556b235a99378f1d434e24a6595bc71148ef..e59d5c95f0452886b5eb33234428beae07dc6d37 100644 (file)
--- a/heat/tests/test_cfn.py
+++ b/heat/tests/test_cfn.py
@@ -12,9 +12,11 @@ from nose.plugins.attrib import attr
 from nose import with_setup
 import unittest
 import shutil
-
-from heat.cfntools.cfn_helper import *
-
+from nose.exc import SkipTest
+try:
+  from heat.cfntools.cfn_helper import *
+except:
+  raise SkipTest("unable to import cfn helper, skipping")
 
 @attr(tag=['unit', 'cfn_helper'])
 @attr(speed='fast')