resolve test template file path no matter where it is run from
This commit is contained in:
parent
675b8a4f71
commit
a66f891e1e
|
@ -17,6 +17,9 @@ from heatclient.v1 import client as v1client
|
||||||
import heatclient.shell
|
import heatclient.shell
|
||||||
import fakes
|
import fakes
|
||||||
|
|
||||||
|
TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||||
|
'var'))
|
||||||
|
|
||||||
|
|
||||||
class ShellTest(unittest.TestCase):
|
class ShellTest(unittest.TestCase):
|
||||||
|
|
||||||
|
@ -140,11 +143,12 @@ class ShellTest(unittest.TestCase):
|
||||||
|
|
||||||
self.m.ReplayAll()
|
self.m.ReplayAll()
|
||||||
|
|
||||||
|
template_file = os.path.join(TEST_VAR_DIR, 'minimal.template')
|
||||||
create_text = self.shell('create teststack '
|
create_text = self.shell('create teststack '
|
||||||
'--template-file=minimal.template '
|
'--template-file=%s '
|
||||||
'--parameters="InstanceType=m1.large;DBUsername=wp;'
|
'--parameters="InstanceType=m1.large;DBUsername=wp;'
|
||||||
'DBPassword=verybadpassword;KeyName=heat_key;'
|
'DBPassword=verybadpassword;KeyName=heat_key;'
|
||||||
'LinuxDistribution=F17"')
|
'LinuxDistribution=F17"' % template_file)
|
||||||
|
|
||||||
required = [
|
required = [
|
||||||
'id',
|
'id',
|
||||||
|
|
Loading…
Reference in New Issue