From c65c25c73d8e0749d5171bbc76a15598d008dbf9 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Thu, 6 Jun 2013 15:34:45 +1200 Subject: [PATCH] Rename functions which should not be run as tests. These function names confuse some test runners which results in them incorrectly being run as tests. Change-Id: I0780c7d6dcea5019771b42fa5ffb2ebe215c1e20 --- heat/tests/test_cli.py | 8 ++++---- heat/tests/test_engine_service.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/heat/tests/test_cli.py b/heat/tests/test_cli.py index 4848e88f..bafb4d45 100644 --- a/heat/tests/test_cli.py +++ b/heat/tests/test_cli.py @@ -24,15 +24,15 @@ basepath = os.path.join(heat.__path__[0], os.path.pardir) class CliTest(testtools.TestCase): def test_heat_cfn(self): - self.bin_test_run('heat-cfn') + self.bin_run('heat-cfn') def test_heat_boto(self): - self.bin_test_run('heat-boto') + self.bin_run('heat-boto') def test_heat_watch(self): - self.bin_test_run('heat-watch') + self.bin_run('heat-watch') - def bin_test_run(self, bin): + def bin_run(self, bin): fullpath = basepath + '/bin/' + bin proc = subprocess.Popen(fullpath, diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index b98ffd7f..47974506 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -103,7 +103,7 @@ def setup_mocks(mocks, stack): return fc -def setup_test_stack(stack_name, ctx, create_res=True): +def setup_stack(stack_name, ctx, create_res=True): stack = get_wordpress_stack(stack_name, ctx) stack.store() if create_res: @@ -140,7 +140,7 @@ def stack_context(stack_name, create_res=True): def create_stack(): ctx = getattr(test_case, 'ctx', None) if ctx is not None: - stack = setup_test_stack(stack_name, ctx, create_res) + stack = setup_stack(stack_name, ctx, create_res) setattr(test_case, 'stack', stack) def delete_stack(): -- 2.45.2