openstack
/
instack
Code Issues Proposed changes

Fix other unit tests

This commit is contained in:
James Slagle 2014-02-03 13:48:29 -05:00
parent 5ee843932c
commit 60720be4b0
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
instack/runner.py
View File

@ -30,7 +30,7 @@ from instack import element
class ElementRunner(object):
def __init__(self, elements, hooks, element_paths=None, blacklist=None,
exclude_element=None, dry_run=False, interactive=False,
exclude_elements=None, dry_run=False, interactive=False,
no_cleanup=False):
"""Element Runner initialization.
@ -47,7 +47,7 @@ class ElementRunner(object):
self.dry_run = dry_run
self.hooks = hooks
self.blacklist = blacklist or []
self.exclude_element = exclude_element or []
self.exclude_elements = exclude_elements or []
self.interactive = interactive
self.no_cleanup = no_cleanup
self.loaded_elements = {}
@ -68,7 +68,7 @@ class ElementRunner(object):
self.load_elements()
self.load_dependencies()
self.exclude_elements()
self.process_exclude_elements()
self.copy_elements()
def run(self):
@ -135,10 +135,10 @@ class ElementRunner(object):
self.elements = all_elements
logging.info("List of all elements: %s" % self.elements)
def exclude_elements(self):
def process_exclude_elements(self):
"""Remove any elements that have been specified as excluded."""
for elem in self.exclude_element:
if elem in self.elem:
for elem in self.exclude_elements:
if elem in self.elements:
logging.info("Excluding element %s" % elem)
self.elements.remove(elem)

9
instack/tests/test_runner.py
View File

@ -68,12 +68,12 @@ class TestRunner(testtools.TestCase):
self.assertEqual(len(self.runner.elements), 3)
self.assertTrue('dep1' in self.runner.elements)
def test_exclude_elements(self):
def test_process_exclude_elements(self):
self.runner.exclude_elements = ['dep1']
self.runner.copy_elements()
self.runner.load_dependencies()
self.runner.exclude_elements()
self.runner.process_exclude_elements()
self.assertEqual(len(self.runner.elements), 2)
self.assertFalse('dep1' in self.runner.elements)
@ -81,6 +81,7 @@ class TestRunner(testtools.TestCase):
def test_process_path(self):
cwd = os.path.dirname(__file__)
test_elements = os.path.join(cwd, 'elements')
self.runner.loaded_elements = {}
self.runner.process_path(test_elements)
self.assertEqual(len(self.runner.loaded_elements), 6)
@ -99,7 +100,7 @@ class TestRunner(testtools.TestCase):
def test_run_hook(self, mock_call):
self.runner.copy_elements()
self.runner.load_dependencies()
self.runner.exclude_elements()
self.runner.process_exclude_elements()
self.runner.run_hook('install')
@ -114,7 +115,7 @@ class TestRunner(testtools.TestCase):
def test_blacklist(self, mock_call):
self.runner.copy_elements()
self.runner.load_dependencies()
self.runner.exclude_elements()
self.runner.process_exclude_elements()
self.runner.blacklist = ['50-echo']
self.runner.run_hook('install')