mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
92d6d4ab75
The return data from run_run_plus previously returned the runner return in the ``fun`` key. This has since been corrected. This commit replaces these references to the ``fun`` key with the corrected ``return`` key.
49 lines
1.1 KiB
Python
49 lines
1.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
Tests for the salt-run command
|
|
'''
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
from salttesting import skipIf
|
|
from salttesting.helpers import ensure_in_syspath
|
|
ensure_in_syspath('../../')
|
|
|
|
# Import salt libs
|
|
import integration
|
|
|
|
|
|
class ManageTest(integration.ShellCase):
|
|
'''
|
|
Test the manage runner
|
|
'''
|
|
def test_active(self):
|
|
'''
|
|
jobs.active
|
|
'''
|
|
ret = self.run_run_plus('jobs.active')
|
|
self.assertEqual(ret['return'], {})
|
|
self.assertEqual(ret['out'], [])
|
|
|
|
def test_lookup_jid(self):
|
|
'''
|
|
jobs.lookup_jid
|
|
'''
|
|
ret = self.run_run_plus('jobs.lookup_jid', '23974239742394')
|
|
self.assertEqual(ret['return'], {})
|
|
self.assertEqual(ret['out'], [])
|
|
|
|
@skipIf(True, 'to be reenabled when #23623 is merged')
|
|
def test_list_jobs(self):
|
|
'''
|
|
jobs.list_jobs
|
|
'''
|
|
ret = self.run_run_plus('jobs.list_jobs')
|
|
self.assertIsInstance(ret['return'], dict)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
from integration import run_tests
|
|
run_tests(ManageTest)
|