arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112 from n-pochet/bug/111

Browse Source 
Fix parameters passed to `async_run_on_unit`
This commit is contained in:
Liam Young
2018-08-14 10:25:47 +01:00
committed by GitHub
parent 4416ff9cb8 b84b24b72a
commit 8157e3bbfb
2 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
unit_tests/test_zaza_model.py
View File

@@ -634,24 +634,52 @@ class TestModel(ut_utils.BaseTestCase):
'stopped')
def test_get_unit_time(self):
async def _run_on_unit(model_name, unit_name, cmd, timeout=None):
async def _run_on_unit(
unit_name,
command,
model_name=None,
timeout=None
):
return {'Stdout': '1524409654'}
self.patch_object(model, 'async_run_on_unit')
self.async_run_on_unit.side_effect = _run_on_unit
self.assertEqual(
model.get_unit_time('app/2'),
1524409654)
self.async_run_on_unit.assert_called_once_with(
unit_name='app/2',
command="date +'%s'",
model_name=None,
timeout=None
)
def test_get_unit_service_start_time(self):
async def _run_on_unit(model_name, unit_name, cmd, timeout=None):
async def _run_on_unit(
unit_name,
command,
model_name=None,
timeout=None
):
return {'Stdout': '1524409654'}
self.patch_object(model, 'async_run_on_unit')
self.async_run_on_unit.side_effect = _run_on_unit
self.assertEqual(
model.get_unit_service_start_time('app/2', 'mysvc1'), 1524409654)
cmd = "stat -c %Y /proc/$(pidof -x mysvc1 | cut -f1 -d ' ')"
self.async_run_on_unit.assert_called_once_with(
unit_name='app/2',
command=cmd,
model_name=None,
timeout=None
)
def test_get_unit_service_start_time_not_running(self):
async def _run_on_unit(model_name, unit_name, cmd, timeout=None):
async def _run_on_unit(
unit_name,
command,
model_name=None,
timeout=None
):
return {'Stdout': ''}
self.patch_object(model, 'async_run_on_unit')
self.async_run_on_unit.side_effect = _run_on_unit

12
zaza/model.py
View File

@@ -288,9 +288,9 @@ async def async_get_unit_time(unit_name, model_name=None, timeout=None):
:rtype: int
"""
out = await async_run_on_unit(
model_name,
unit_name,
"date +'%s'",
unit_name=unit_name,
command="date +'%s'",
model_name=model_name,
timeout=timeout)
return int(out['Stdout'])
@@ -318,7 +318,11 @@ async def async_get_unit_service_start_time(unit_name, service,
:raises: ServiceNotRunning
"""
cmd = "stat -c %Y /proc/$(pidof -x {} | cut -f1 -d ' ')".format(service)
out = await async_run_on_unit(model_name, unit_name, cmd, timeout=timeout)
out = await async_run_on_unit(
unit_name=unit_name,
command=cmd,
model_name=model_name,
timeout=timeout)
out = out['Stdout'].strip()
if out:
return int(out)