+ test info on empty results

Author: LD250

jenkins_cli/cli.py

@@ -27,6 +27,12 @@ class JenkinsCli(object):
 
     QUEUE_EMPTY_TEXT = "Building Queue is empty"
 
+    INFO_TEMPLATE = ("Last build name: %s (result: %s)\n"
+                     "Last success build name: %s\n"
+                     "Build started: %s\n"
+                     "Building now: %s\n"
+                     "%s branch set to: %s")
+
     def __init__(self, args, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
         self.jenkins = self.auth(args.host, args.username, args.password, timeout)
 
@@ -116,25 +122,20 @@ def info(self, args):
             job_info = {}
         last_build = job_info.get('lastBuild', {})
         last_success_build = job_info.get('lastSuccessfulBuild', {})
-        info = ("Last build name: %s (result: %s)\n"
-                "Last success build name: %s\n"
-                "Build started: %s\n"
-                "Building now: %s\n"
-                "%s branch set to: %s")
         xml = self.jenkins.get_job_config(job_name)
         root = ElementTree.fromstring(xml.encode('utf-8'))
         scm_name, branch_node = self._get_scm_name_and_node(root)
         if branch_node is not None:
             branch_name = branch_node.text
         else:
             branch_name = 'Unknown branch'
-        print(info % (last_build.get('fullDisplayName', 'Not Built'),
-                      last_build.get('result', 'Not Built'),
-                      last_success_build.get('fullDisplayName', 'Not Built'),
-                      datetime.datetime.fromtimestamp(last_build['timestamp'] / 1000) if last_build else 'Not built',
-                      'Yes' if last_build.get('building') else 'No',
-                      scm_name,
-                      branch_name))
+        print(self.INFO_TEMPLATE % (last_build.get('fullDisplayName', 'Not Built'),
+                                    last_build.get('result', 'Not Built'),
+                                    last_success_build.get('fullDisplayName', 'Not Built'),
+                                    datetime.datetime.fromtimestamp(last_build['timestamp'] / 1000) if last_build else 'Not Built',
+                                    'Yes' if last_build.get('building') else 'No',
+                                    scm_name,
+                                    branch_name))
 
     def set_branch(self, args):
         job_name = self._check_job(args.job_name)

tests/test_cli.py

@@ -191,5 +191,16 @@ def test_get_scm_name_and_node(self):
         self.assertEqual(name, 'UnknownSCM')
         self.assertEqual(branch_node, None)
 
+    @mock.patch.object(jenkins.Jenkins, 'get_job_config')
+    @mock.patch.object(jenkins.Jenkins, 'get_job_info')
+    @mock.patch.object(jenkins.Jenkins, 'get_job_name', return_value='Job1')
+    def test_info(self, patched_get_job_name, patched_get_job_info, patched_get_job_config):
+        self.args.job_name = "Job1"
+        patched_get_job_info.return_value = {}
+        patched_get_job_config.return_value = EMPTY_SCM_XML
+        JenkinsCli(self.args).info(self.args)
+        arg = JenkinsCli.INFO_TEMPLATE % ('Not Built', 'Not Built', 'Not Built', 'Not Built', 'No', 'UnknownSCM', 'Unknown branch')
+        self.patched_print.assert_has_calls([mock.call(arg)])
+
 if __name__ == '__main__':
     unittest.main()