From 028f33397082ca3169ad5a0a975853df8a1e27e4 Mon Sep 17 00:00:00 2001 From: Chris Alfonso Date: Mon, 30 Apr 2012 13:04:51 -0400 Subject: [PATCH] Skipping the import if its deps aren't installed, use --no-skip if you want to run this --- heat/tests/test_cfn.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/heat/tests/test_cfn.py b/heat/tests/test_cfn.py index bdbf556b23..e59d5c95f0 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')