saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update the test cases which better expose #2068.

Browse source
This commit is contained in:
Pedro Algarvio 2012-09-28 16:04:38 +01:00
parent cc10ed1906
commit 677a08fe7d
4 changed files with 101 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/integration/files/file/base/issue-2068-template-str-no-dot.sls Normal file
View file

@ -0,0 +1,14 @@
/tmp/issue-2068-template-str:
virtualenv:
- managed
- no_site_packages: True
- distribute: True
pep8-pip:
pip:
- installed
- name: pep8
- bin_env: /tmp/issue-2068-template-str
- mirrors: http://testpypi.python.org/pypi
- require:
- virtualenv: /tmp/issue-2068-template-str

12
tests/integration/files/file/base/issue-2068-template-str.sls Normal file
View file

@ -0,0 +1,12 @@
/tmp/issue-2068-template-str:
virtualenv.managed:
- no_site_packages: True
- distribute: True
pep8-pip:
pip.installed:
- name: pep8
- bin_env: /tmp/issue-2068-template-str
- mirrors: http://testpypi.python.org/pypi
- require:
- virtualenv: /tmp/issue-2068-template-str

75
tests/integration/modules/state.py
View file

@ -1,5 +1,6 @@
# Import python libs
import os
import shutil
import integration
@ -169,7 +170,81 @@ fi
if os.path.isfile(fname):
os.remove(fname)
def test_issue_2068_template_str(self):
venv_dir = '/tmp/issue-2068-template-str'
try:
ret = self.run_function(
'state.sls', mods='issue-2068-template-str-no-dot'
)
self.assertTrue(isinstance(ret, dict))
self.assertNotEqual(ret, {})
for part in ret.itervalues():
self.assertTrue(part['result'])
finally:
if os.path.isdir(venv_dir):
shutil.rmtree(venv_dir)
# Let's load the template from the filesystem. If running this state
# with state.sls works, so should using state.template_str
template_path = os.path.join(
os.path.dirname(os.path.dirname(__file__)),
'files', 'file', 'base', 'issue-2068-template-str-no-dot.sls'
)
template = open(template_path, 'r').read()
try:
ret = self.run_function('state.template_str', [template])
self.assertTrue(isinstance(ret, dict)), ret
self.assertNotEqual(ret, {})
for key in ret.iterkeys():
self.assertTrue(ret[key]['result'])
self.assertTrue(
os.path.isfile(os.path.join(venv_dir, 'bin', 'pep8'))
)
finally:
if os.path.isdir(venv_dir):
shutil.rmtree(venv_dir)
# Now the problematic #2068 including dot's
try:
ret = self.run_function(
'state.sls', mods='issue-2068-template-str'
)
self.assertTrue(isinstance(ret, dict))
self.assertNotEqual(ret, {})
for part in ret.itervalues():
self.assertTrue(part['result'])
finally:
if os.path.isdir(venv_dir):
shutil.rmtree(venv_dir)
# Let's load the template from the filesystem. If running this state
# with state.sls works, so should using state.template_str
template_path = os.path.join(
os.path.dirname(os.path.dirname(__file__)),
'files', 'file', 'base', 'issue-2068-template-str.sls'
)
template = open(template_path, 'r').read()
try:
ret = self.run_function('state.template_str', [template])
self.assertTrue(isinstance(ret, dict)), ret
self.assertNotEqual(ret, {})
for key in ret.iterkeys():
self.assertTrue(ret[key]['result'])
self.assertTrue(
os.path.isfile(os.path.join(venv_dir, 'bin', 'pep8'))
)
finally:
if os.path.isdir(venv_dir):
shutil.rmtree(venv_dir)
if __name__ == '__main__':

27
tests/integration/states/pip.py
View file

@ -114,33 +114,6 @@ class PipStateTest(integration.ModuleCase):
if os.path.isdir(venv_dir):
shutil.rmtree(venv_dir)
def test_issue_2028_pip_installed_template(self):
venv_dir = '/tmp/issue-2028-pip-installed'
# Let's load the template from the filesystem. If from state it works
# so should like this.
template_path = os.path.join(
os.path.dirname(os.path.dirname(__file__)),
'files', 'file', 'base', 'issue-2028-pip-installed.sls'
)
template = open(template_path, 'r').read()
try:
ret = self.run_function('state.template_str', [template])
self.assertTrue(isinstance(ret, dict)), ret
self.assertNotEqual(ret, {})
for key in ret.iterkeys():
self.assertTrue(ret[key]['result'])
self.assertTrue(
os.path.isfile(os.path.join(venv_dir, 'bin', 'supervisord'))
)
finally:
if os.path.isdir(venv_dir):
shutil.rmtree(venv_dir)
def test_issue_2087_missing_pip(self):
venv_dir = '/tmp/issue-2087-missing-pip'
try: