mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Migrated test.integration.modules.state to use SaltReturnAssertsMixIn.
This commit is contained in:
Pedro Algarvio
parent
4348734697
commit
871516b4cf
1 changed files with 23 additions and 121 deletions
|
|
@ -7,7 +7,8 @@ import salt.utils
|
|||
import integration
|
||||
|
||||
|
||||
class StateModuleTest(integration.ModuleCase):
|
||||
class StateModuleTest(integration.ModuleCase,
|
||||
integration.SaltReturnAssertsMixIn):
|
||||
'''
|
||||
Validate the test module
|
||||
'''
|
||||
|
|
@ -61,37 +62,13 @@ class StateModuleTest(integration.ModuleCase):
|
|||
os.unlink(testfile)
|
||||
|
||||
ret = self.run_function('state.sls', mods='testappend')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
ret = self.run_function('state.sls', mods='testappend.step-1')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
ret = self.run_function('state.sls', mods='testappend.step-2')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
self.assertMultiLineEqual('''\
|
||||
# set variable identifying the chroot you work in (used in the prompt below)
|
||||
|
|
@ -107,26 +84,10 @@ fi
|
|||
|
||||
# Re-append switching order
|
||||
ret = self.run_function('state.sls', mods='testappend.step-2')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
ret = self.run_function('state.sls', mods='testappend.step-1')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
self.assertMultiLineEqual('''\
|
||||
# set variable identifying the chroot you work in (used in the prompt below)
|
||||
|
|
@ -180,39 +141,15 @@ fi
|
|||
|
||||
# Create the file
|
||||
ret = self.run_function('state.sls', mods='issue-1879')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
# The first append
|
||||
ret = self.run_function('state.sls', mods='issue-1879.step-1')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
# The second append
|
||||
ret = self.run_function('state.sls', mods='issue-1879.step-2')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
# Does it match?
|
||||
try:
|
||||
|
|
@ -222,23 +159,10 @@ fi
|
|||
)
|
||||
# Make sure we don't re-append existing text
|
||||
ret = self.run_function('state.sls', mods='issue-1879.step-1')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
ret = self.run_function('state.sls', mods='issue-1879.step-2')
|
||||
try:
|
||||
self.assertTrue(isinstance(ret, dict)), ret
|
||||
self.assertNotEqual(ret, {})
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
except AssertionError:
|
||||
print ret
|
||||
raise
|
||||
self.assertSaltTrueReturn(ret)
|
||||
self.assertMultiLineEqual(
|
||||
contents,
|
||||
salt.utils.fopen(testfile, 'r').read()
|
||||
|
|
@ -261,8 +185,8 @@ fi
|
|||
)
|
||||
try:
|
||||
ret = self.run_function('state.sls', mods='include-test')
|
||||
for part in ret.itervalues():
|
||||
self.assertTrue(part['result'])
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
for fname in fnames:
|
||||
self.assertTrue(os.path.isfile(fname))
|
||||
self.assertFalse(os.path.isfile(exclude_test_file))
|
||||
|
|
@ -281,8 +205,8 @@ fi
|
|||
)
|
||||
try:
|
||||
ret = self.run_function('state.sls', mods='exclude-test')
|
||||
for part in ret.itervalues():
|
||||
self.assertTrue(part['result'])
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
for fname in fnames:
|
||||
self.assertTrue(os.path.isfile(fname))
|
||||
self.assertFalse(os.path.isfile(to_include_test_file))
|
||||
|
|
@ -300,10 +224,7 @@ fi
|
|||
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'])
|
||||
self.assertSaltTrueReturn(ret)
|
||||
finally:
|
||||
if os.path.isdir(venv_dir):
|
||||
shutil.rmtree(venv_dir)
|
||||
|
|
@ -318,12 +239,7 @@ fi
|
|||
template = salt.utils.fopen(template_path, 'r').read()
|
||||
try:
|
||||
ret = self.run_function('state.template_str', [template])
|
||||
|
||||
self.assertTrue(isinstance(ret, dict))
|
||||
self.assertNotEqual(ret, {})
|
||||
|
||||
for key in ret.iterkeys():
|
||||
self.assertTrue(ret[key]['result'])
|
||||
self.assertSaltTrueReturn(ret)
|
||||
|
||||
self.assertTrue(
|
||||
os.path.isfile(os.path.join(venv_dir, 'bin', 'pep8'))
|
||||
|
|
@ -335,10 +251,7 @@ fi
|
|||
# Now using state.template
|
||||
try:
|
||||
ret = self.run_function('state.template', [template_path])
|
||||
self.assertTrue(isinstance(ret, dict))
|
||||
self.assertNotEqual(ret, {})
|
||||
for part in ret.itervalues():
|
||||
self.assertTrue(part['result'])
|
||||
self.assertSaltTrueReturn(ret)
|
||||
finally:
|
||||
if os.path.isdir(venv_dir):
|
||||
shutil.rmtree(venv_dir)
|
||||
|
|
@ -348,10 +261,7 @@ fi
|
|||
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'])
|
||||
self.assertSaltTrueReturn(ret)
|
||||
finally:
|
||||
if os.path.isdir(venv_dir):
|
||||
shutil.rmtree(venv_dir)
|
||||
|
|
@ -366,12 +276,7 @@ fi
|
|||
template = salt.utils.fopen(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.assertSaltTrueReturn(ret)
|
||||
|
||||
self.assertTrue(
|
||||
os.path.isfile(os.path.join(venv_dir, 'bin', 'pep8'))
|
||||
|
|
@ -383,10 +288,7 @@ fi
|
|||
# Now using state.template
|
||||
try:
|
||||
ret = self.run_function('state.template', [template_path])
|
||||
self.assertTrue(isinstance(ret, dict))
|
||||
self.assertNotEqual(ret, {})
|
||||
for part in ret.itervalues():
|
||||
self.assertTrue(part['result'])
|
||||
self.assertSaltTrueReturn(ret)
|
||||
finally:
|
||||
if os.path.isdir(venv_dir):
|
||||
shutil.rmtree(venv_dir)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue