mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
7f6942ec7f
Fixed testing for tomcat.wait, as well as updating style. Should resolve any test errors isolated to the module and/or state.
229 lines
10 KiB
Python
229 lines
10 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Rahul Handay <rahulha@saltstack.com>`
|
|
'''
|
|
|
|
# Import Python Libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Libs
|
|
from salt.states import tomcat
|
|
|
|
# Import Salt Testing Libs
|
|
from salttesting import TestCase, skipIf
|
|
from salttesting.helpers import ensure_in_syspath
|
|
from salttesting.mock import (
|
|
MagicMock,
|
|
patch,
|
|
NO_MOCK,
|
|
NO_MOCK_REASON
|
|
)
|
|
|
|
ensure_in_syspath('../../')
|
|
|
|
# Globals
|
|
tomcat.__salt__ = {}
|
|
tomcat.__opts__ = {}
|
|
tomcat.__env__ = {}
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class TomcatTestCase(TestCase):
|
|
'''
|
|
Validate the tomcat state
|
|
'''
|
|
|
|
def test_war_deployed(self):
|
|
'''
|
|
Test to enforce that the WAR will be deployed and
|
|
started in the context path it will make use of WAR versions
|
|
'''
|
|
ret = {'name': 'salt',
|
|
'changes': {},
|
|
'result': True,
|
|
'comment': ''}
|
|
mock_start = MagicMock(return_value='saltstack')
|
|
mock_undeploy = MagicMock(side_effect=['FAIL', 'saltstack'])
|
|
mock_deploy = MagicMock(return_value='deploy')
|
|
mock_ls = MagicMock(side_effect=[{'salt': {'version': 'jenkins-1.20.4',
|
|
'mode': 'running'}},
|
|
{'salt': {'version': '1'}},
|
|
{'salt': {'version': 'jenkins-1.2.4',
|
|
'mode': 'run'}},
|
|
{'salt': {'version': '1'}},
|
|
{'salt': {'version': '1'}},
|
|
{'salt': {'version': '1'}}])
|
|
with patch.dict(tomcat.__salt__, {"tomcat.ls": mock_ls,
|
|
'tomcat.start': mock_start,
|
|
'tomcat.undeploy': mock_undeploy,
|
|
'tomcat.deploy_war': mock_deploy}):
|
|
ret.update({'comment': 'salt with version 1.20.4'
|
|
' is already deployed'})
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins'
|
|
'-1.20.4.war'), ret)
|
|
|
|
with patch.dict(tomcat.__opts__, {"test": True}):
|
|
ret.update({'changes': {'deploy': 'will deploy salt'
|
|
' with version 1.2.4',
|
|
'undeploy': 'undeployed salt'
|
|
' with version 1'},
|
|
'result': None, 'comment': ''})
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins'
|
|
'-1.2.4.war'), ret)
|
|
|
|
with patch.dict(tomcat.__opts__, {"test": False}):
|
|
ret.update({'changes': {'start': 'starting salt'},
|
|
'comment': 'saltstack', 'result': False})
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins'
|
|
'-1.2.4.war'), ret)
|
|
|
|
ret.update({'changes': {'deploy': 'will deploy salt with'
|
|
' version 1.2.4',
|
|
'undeploy': 'undeployed salt with'
|
|
' version 1'},
|
|
'comment': 'FAIL'})
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins'
|
|
'-1.2.4.war'), ret)
|
|
|
|
ret.update({'changes': {'undeploy': 'undeployed salt'
|
|
' with version 1'},
|
|
'comment': 'deploy'})
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins'
|
|
'-1.2.4.war'), ret)
|
|
|
|
def test_war_deployed_no_version(self):
|
|
'''
|
|
Tests that going from versions to no versions and back work, as well
|
|
as not overwriting a WAR without version with another without version.
|
|
'''
|
|
ret = {'name': 'salt',
|
|
'changes': {},
|
|
'result': None,
|
|
'comment': ''}
|
|
|
|
mock_deploy = MagicMock(return_value='deploy')
|
|
mock_undeploy = MagicMock(return_value='SUCCESS')
|
|
mock_ls_version = MagicMock(return_value={'salt': {'version': '1.2.4',
|
|
'mode': 'running'}})
|
|
mock_ls_no_version = MagicMock(return_value={'salt': {'version': '',
|
|
'mode': 'running'}})
|
|
|
|
# We're just checking what it *would* do.
|
|
with patch.dict(tomcat.__opts__, {"test": True}):
|
|
with patch.dict(tomcat.__salt__,
|
|
{"tomcat.ls": mock_ls_version,
|
|
"tomcat.deploy_war": mock_deploy,
|
|
"tomcat.undeploy": mock_undeploy}):
|
|
# We deploy from version to no version
|
|
ret.update({'changes':
|
|
{'deploy': 'will deploy salt with no version',
|
|
'undeploy': 'undeployed salt with version 1.2.4'},
|
|
})
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins.war'),
|
|
ret)
|
|
|
|
with patch.dict(tomcat.__salt__,
|
|
{"tomcat.ls": mock_ls_no_version,
|
|
"tomcat.deploy_war": mock_deploy,
|
|
"tomcat.undeploy": mock_undeploy}):
|
|
# Deploy from none to specified version
|
|
ret.update({'changes':
|
|
{'deploy': 'will deploy salt with version 1.2.4',
|
|
'undeploy': 'undeployed salt with no version'},
|
|
})
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins.war',
|
|
version='1.2.4'),
|
|
ret)
|
|
# Deploy from none to extracted version
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins-1.2.4.war'),
|
|
ret)
|
|
# Don't deploy from no version to no version
|
|
ret.update({'changes': {},
|
|
'comment': 'salt with no version is already deployed',
|
|
'result': True
|
|
})
|
|
# Don't deploy from blank to blank version
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins.war'),
|
|
ret)
|
|
# Don't deploy from blank to false version
|
|
self.assertDictEqual(tomcat.war_deployed('salt',
|
|
'salt://jenkins-1.2.4.war',
|
|
version=False),
|
|
ret)
|
|
|
|
def test_wait(self):
|
|
'''
|
|
Test to wait for the tomcat manager to load
|
|
'''
|
|
ret = {'name': 'salt',
|
|
'changes': {},
|
|
'result': True,
|
|
'comment': 'tomcat manager is ready'}
|
|
mock = MagicMock(return_value=True)
|
|
with patch.dict(tomcat.__salt__, {"tomcat.status": mock}):
|
|
self.assertDictEqual(tomcat.wait('salt'), ret)
|
|
|
|
def test_mod_watch(self):
|
|
'''
|
|
Test to the tomcat watcher function.
|
|
'''
|
|
ret = {'name': 'salt',
|
|
'changes': {},
|
|
'result': False,
|
|
'comment': 'True'}
|
|
mock = MagicMock(return_value='True')
|
|
with patch.dict(tomcat.__salt__, {"tomcat.reload": mock}):
|
|
ret.update({'changes': {'salt': False}})
|
|
self.assertDictEqual(tomcat.mod_watch('salt'), ret)
|
|
|
|
def test_undeployed(self):
|
|
'''
|
|
Test to enforce that the WAR will be un-deployed from the server
|
|
'''
|
|
ret = {'name': 'salt',
|
|
'changes': {},
|
|
'result': False,
|
|
'comment': 'True'}
|
|
mock = MagicMock(side_effect=[False, True, True, True, True])
|
|
mock1 = MagicMock(side_effect=[{'salt': {'a': 1}},
|
|
{'salt': {'version': 1}},
|
|
{'salt': {'version': 1}},
|
|
{'salt': {'version': 1}}])
|
|
mock2 = MagicMock(side_effect=['FAIL', 'saltstack'])
|
|
with patch.dict(tomcat.__salt__, {"tomcat.status": mock,
|
|
"tomcat.ls": mock1,
|
|
"tomcat.undeploy": mock2}):
|
|
ret.update({'comment': 'Tomcat Manager does not respond'})
|
|
self.assertDictEqual(tomcat.undeployed('salt'), ret)
|
|
|
|
ret.update({'comment': '', 'result': True})
|
|
self.assertDictEqual(tomcat.undeployed('salt'), ret)
|
|
|
|
with patch.dict(tomcat.__opts__, {"test": True}):
|
|
ret.update({'changes': {'undeploy': 1}, 'result': None})
|
|
self.assertDictEqual(tomcat.undeployed('salt'), ret)
|
|
|
|
with patch.dict(tomcat.__opts__, {"test": False}):
|
|
ret.update({'changes': {'undeploy': 1},
|
|
'comment': 'FAIL', 'result': False})
|
|
self.assertDictEqual(tomcat.undeployed('salt'), ret)
|
|
|
|
ret.update({'changes': {'undeploy': 1},
|
|
'comment': '', 'result': True})
|
|
self.assertDictEqual(tomcat.undeployed('salt'), ret)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
from integration import run_tests
|
|
|
|
run_tests(TomcatTestCase, needs_daemon=False)
|