From: Chris Alfonso <calfonso@redhat.com>
Date: Mon, 30 Apr 2012 17:04:51 +0000 (-0400)
Subject: Skipping the import if its deps aren't installed, use --no-skip if you want to run... 
X-Git-Tag: 2014.1~1905
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=028f33397082ca3169ad5a0a975853df8a1e27e4;p=openstack-build%2Fheat-build.git

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

diff --git a/heat/tests/test_cfn.py b/heat/tests/test_cfn.py
index bdbf556b..e59d5c95 100644
--- 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')