TT#11437 don't set release_target for empty values

* don't add \" to release when calling workfront-target-task

Change-Id: I7020768b77b6ee21e2dfaaf21aeef0cc443709cb

repoapi/models/wni.py

@@ -65,7 +65,8 @@ def workfront_release_target(instance, wid):
         release = branch
     else:
         release = utils.get_next_release(branch)
-    utils.workfront_set_release_target(wid, release)
+    if release:
+        utils.workfront_set_release_target(wid, release)
 
 
 def workfront_note_add(instance, message, release_target=False):

repoapi/test/test_utils.py

@@ -39,3 +39,9 @@ class UtilsTestCase(BaseTest):
         ear.return_value = [0, "mr5.4.2\n", ""]
         val = utils.get_next_release("mr5.4")
         self.assertEquals(val, 'mr5.4.2')
+
+    @patch('repoapi.utils.executeAndReturnOutput')
+    def test_get_next_release0(self, ear):
+        ear.return_value = [0, "\n", ""]
+        val = utils.get_next_release("mr5.4")
+        self.assertEquals(val, None)

repoapi/test/test_workfrontnote.py

@@ -240,3 +240,36 @@ class WorkfrontNoteTestCase(BaseTest):
         wsrt.assert_called_once_with("0001", "mr5.5.2")
         gnr.assert_not_called()
         wns.assert_called_once_with("0001", msg)
+
+    @patch('repoapi.utils.workfront_set_release_target')
+    @patch('repoapi.utils.get_next_release')
+    @patch('repoapi.utils.workfront_note_send')
+    def test_note_commit_next_distri(self, wns, gnr, wsrt):
+        param = self.get_non_gerrit_defaults()
+        param['jobname'] = 'kamailio-get-code'
+        param['param_branch'] = 'stretch/master'
+        param['param_distribution'] = 'stretch'
+        gnr.return_value = ''
+        JenkinsBuildInfo.objects.create(**param)
+
+        gri = WorkfrontNoteInfo.objects.filter(
+            workfront_id="0001",
+            gerrit_change="7fg4567")
+        self.assertEquals(gri.count(), 1)
+
+        param['jobname'] = "kamailio-binaries"
+        param['buildnumber'] = 897
+        JenkinsBuildInfo.objects.create(**param)
+
+        gri = WorkfrontNoteInfo.objects.filter(
+            workfront_id="0001",
+            gerrit_change="7fg4567")
+        self.assertEquals(gri.count(), 1)
+        msg = "%s[%s] commit created %s " % (
+            param['projectname'],
+            param['param_branch'],
+            settings.GITWEB_URL.format("kamailio", "7fg4567"))
+        gnr.assert_called_once_with("stretch/master")
+        self.assertItemsEqual(wsrt.mock_calls, [])
+        wsrt.assert_not_called()
+        wns.assert_called_once_with("0001", msg)

repoapi/utils.py

@@ -151,7 +151,11 @@ def get_next_release(branch):
         logger.error(
             "can't find out next release version. %s. %s", res[1], res[2])
         return None
-    return res[1].rstrip()
+    val = res[1].rstrip()
+    if len(val) > 0:
+        return val
+    else:
+        return None
 
 
 def workfront_set_release_target(_id, release):
@@ -159,7 +163,7 @@ def workfront_set_release_target(_id, release):
         "/usr/bin/workfront-target-task",
         "--credfile=%s" % settings.WORKFRONT_CREDENTIALS,
         "--taskid=%s" % _id,
-        '--release="%s"' % release
+        '--release=%s' % release
     ]
     logger.debug("workfront-target-task command: %s", command)
     res = executeAndReturnOutput(command)