From b00987868101b75aa599723471689106b4d411e1 Mon Sep 17 00:00:00 2001 From: Chris Alfonso Date: Wed, 23 May 2012 15:37:07 -0400 Subject: [PATCH] using the calculated path for the template tests Change-Id: Ifc5f142cf36a387d32f2ea70dfcb1bb33a44a056 --- heat/tests/test_resources.py | 4 ++-- heat/tests/test_stacks.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heat/tests/test_resources.py b/heat/tests/test_resources.py index 8338890d7..52389a417 100644 --- a/heat/tests/test_resources.py +++ b/heat/tests/test_resources.py @@ -30,7 +30,7 @@ class instancesTest(unittest.TestCase): print "instancesTest teardown complete" def test_instance_create(self): - f = open('templates/WordPress_Single_Instance_gold.template') + f = open("%s/WordPress_Single_Instance_gold.template" % self.path) t = json.loads(f.read()) f.close() @@ -80,7 +80,7 @@ class instancesTest(unittest.TestCase): assert(instance.id > 0) def test_instance_create_delete(self): - f = open('templates/WordPress_Single_Instance_gold.template') + f = open("%s/WordPress_Single_Instance_gold.template" % self.path) t = json.loads(f.read()) f.close() diff --git a/heat/tests/test_stacks.py b/heat/tests/test_stacks.py index 6007a54b5..8f31f8241 100644 --- a/heat/tests/test_stacks.py +++ b/heat/tests/test_stacks.py @@ -31,7 +31,7 @@ class stacksTest(unittest.TestCase): # We use this in a number of tests so it's factored out here. def start_wordpress_stack(self, stack_name): - f = open('templates/WordPress_Single_Instance_gold.template') + f = open("%s/WordPress_Single_Instance_gold.template" % self.path) t = json.loads(f.read()) f.close() params = {} @@ -148,7 +148,7 @@ class stacksTest(unittest.TestCase): self.m.ReplayAll() stack.create_blocking() - f = open('templates/WordPress_Single_Instance_gold.template') + f = open("%s/WordPress_Single_Instance_gold.template" % self.path) t = json.loads(f.read()) params = {} parameters = {}