+ test_set_branch

Author: LD250

jenkins_cli/cli.py

@@ -141,17 +141,14 @@ def set_branch(self, args):
         job_name = self._check_job(args.job_name)
         xml = self.jenkins.get_job_config(job_name)
         root = ElementTree.fromstring(xml.encode('utf-8'))
-        scm = root.find('scm')
-        new_xml = None
-        if scm is not None:
-            revision = scm.find('revision')
-            if revision is not None:
-                revision.text = args.branch_name
-                new_xml = ElementTree.tostring(root)
-                self.jenkins.reconfig_job(job_name, new_xml)
-                print('Done')
-        if new_xml is None:
-            print("Can not set revision info")
+        scm_name, branch_node = self._get_scm_name_and_node(root)
+        if branch_node is not None:
+            branch_node.text = args.branch_name
+            new_xml = ElementTree.tostring(root)
+            self.jenkins.reconfig_job(job_name, new_xml)
+            print('Done')
+        else:
+            print("Can't set branch name")
 
     def start(self, args):
         for job in args.job_name:

tests/test_cli.py

@@ -2,6 +2,7 @@
 import os
 from argparse import Namespace
 from xml.etree import ElementTree
+from datetime import datetime
 
 from pyfakefs import fake_filesystem_unittest
 import mock
@@ -200,7 +201,57 @@ def test_info(self, patched_get_job_name, patched_get_job_info, patched_get_job_
         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)])
+        self.patched_print.assert_called_once_with(arg)
+        self.patched_print.reset_mock()
+
+        ts = 1456870299
+        job_info = {'lastBuild': {'fullDisplayName': 'FDN (cur)',
+                                  'result': 'Done',
+                                  'timestamp': ts * 1000,
+                                  'building': True},
+                    'lastSuccessfulBuild': {'fullDisplayName': 'FDN (last)'}}
+        patched_get_job_info.return_value = job_info
+        patched_get_job_config.return_value = GIT_SCM_XML
+        JenkinsCli(self.args).info(self.args)
+        arg = JenkinsCli.INFO_TEMPLATE % ('FDN (cur)', 'Done', 'FDN (last)', datetime.fromtimestamp(ts), 'Yes', 'Git', 'cli-tests')
+        self.patched_print.assert_called_once_with(arg)
+        self.patched_print.reset_mock()
+
+        job_info['building'] = False
+        patched_get_job_info.return_value = job_info
+        patched_get_job_config.return_value = HG_SCM_XML
+        JenkinsCli(self.args).info(self.args)
+        arg = JenkinsCli.INFO_TEMPLATE % ('FDN (cur)', 'Done', 'FDN (last)', datetime.fromtimestamp(ts), 'Yes', 'Mercurial', 'v123')
+        self.patched_print.assert_called_once_with(arg)
+
+    @mock.patch.object(jenkins.Jenkins, 'reconfig_job')
+    @mock.patch.object(jenkins.Jenkins, 'get_job_config')
+    @mock.patch.object(jenkins.Jenkins, 'get_job_name', return_value='Job1')
+    def test_set_branch(self, patched_get_job_name, patched_get_job_config, patched_reconfig_job):
+        patched_get_job_config.return_value = EMPTY_SCM_XML
+        self.args.job_name = 'Job1'
+        self.args.branch_name = 'b1'
+        JenkinsCli(self.args).set_branch(self.args)
+        self.assertFalse(patched_reconfig_job.called)
+        self.patched_print.assert_called_once_with("Can't set branch name")
+        self.patched_print.reset_mock()
 
+        patched_get_job_config.return_value = GIT_SCM_XML
+        JenkinsCli(self.args).set_branch(self.args)
+        self.assertEqual(patched_reconfig_job.call_args[0][0], 'Job1')
+        self.assertIn('b1', patched_reconfig_job.call_args[0][1])
+        self.assertNotIn('cli-tests', patched_reconfig_job.call_args[1])
+        self.patched_print.assert_called_once_with("Done")
+        patched_reconfig_job.reset_mock()
+        self.patched_print.reset_mock()
+
+        patched_get_job_config.return_value = HG_SCM_XML
+        JenkinsCli(self.args).set_branch(self.args)
+        self.assertEqual(patched_reconfig_job.call_args[0][0], 'Job1')
+        self.assertIn('b1', patched_reconfig_job.call_args[0][1])
+        self.assertNotIn('v123', patched_reconfig_job.call_args[1])
+        self.patched_print.assert_called_once_with("Done")
+        patched_reconfig_job.reset_mock()
+        self.patched_print.reset_mock()
 if __name__ == '__main__':
     unittest.main()