Fix failing shell test case-- and change up jobs runner to use the "output" config instead of hard coding what the option should be. In addition i changed the display_output function to default the "out" to None, since that means "use config" down inside.

salt/output/__init__.py

@@ -27,7 +27,7 @@ STATIC = (
 )
 
 
-def display_output(data, out, opts=None):
+def display_output(data, out=None, opts=None):
     '''
     Print the passed data using the desired output
     '''

salt/runners/jobs.py

@@ -46,7 +46,7 @@ def active():
             if minion not in ret[jid]['Returned']:
                 ret[jid]['Returned'].append(minion)
 
-    salt.output.display_output(ret, 'yaml', __opts__)
+    salt.output.display_output(ret, opts=__opts__)
     return ret
 
 
@@ -64,7 +64,6 @@ def lookup_jid(jid, ext_source=None, output=True):
     mminion = salt.minion.MasterMinion(__opts__)
     returner = _get_returner((__opts__['ext_job_cache'], ext_source, __opts__['master_job_cache']))
 
-    out = 'nested'
     data = mminion.returners['{0}.get_jid'.format(returner)](jid)
     for minion in data:
         if u'return' in data[minion]:
@@ -73,7 +72,7 @@ def lookup_jid(jid, ext_source=None, output=True):
             ret[minion] = data[minion].get('return')
         if 'out' in data[minion]:
             out = data[minion]['out']
-    salt.output.display_output(ret, out, __opts__)
+    salt.output.display_output(ret, opts=__opts__)
     return ret
 
 
@@ -91,11 +90,10 @@ def list_job(jid, ext_source=None):
     mminion = salt.minion.MasterMinion(__opts__)
     returner = _get_returner((__opts__['ext_job_cache'], ext_source, __opts__['master_job_cache']))
 
-    out = 'nested'
     job = mminion.returners['{0}.get_load'.format(returner)](jid)
     ret.update(_format_jid_instance(jid, job))
     ret['Result'] = mminion.returners['{0}.get_jid'.format(returner)](jid)
-    salt.output.display_output(ret, out, __opts__)
+    salt.output.display_output(ret, opts=__opts__)
     return ret
 
 
@@ -112,9 +110,8 @@ def list_jobs(ext_source=None):
     returner = _get_returner((__opts__['ext_job_cache'], ext_source, __opts__['master_job_cache']))
     mminion = salt.minion.MasterMinion(__opts__)
 
-    out = 'nested'
     ret = mminion.returners['{0}.get_jids'.format(returner)]()
-    salt.output.display_output(ret, out, __opts__)
+    salt.output.display_output(ret, opts=__opts__)
 
     return ret
 
@@ -134,11 +131,10 @@ def print_job(jid, ext_source=None):
     returner = _get_returner((__opts__['ext_job_cache'], ext_source, __opts__['master_job_cache']))
     mminion = salt.minion.MasterMinion(__opts__)
 
-    out = 'nested'
     job = mminion.returners['{0}.get_load'.format(returner)](jid)
     ret[jid] = _format_jid_instance(jid, job)
     ret[jid]['Result'] = mminion.returners['{0}.get_jid'.format(returner)](jid)
-    salt.output.display_output(ret, out, __opts__)
+    salt.output.display_output(ret, opts=__opts__)
 
     return ret
 

tests/integration/shell/call.py

@@ -116,9 +116,9 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
                        if 'returnTOmaster' in j][0]
         jid, idx = None, first_match[0]
         while idx > 0:
-            jid = re.match("('|\")([0-9]+)('|\"):", jobs[idx])
+            jid = re.match("([0-9]+):", jobs[idx])
             if jid:
-                jid = jid.group(2)
+                jid = jid.group(1)
                 break
             idx -= 1
         assert idx > 0