From 3da2d6fecff9873b6319f80356a9380eb9887eef Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 20 Mar 2017 12:17:08 +0100 Subject: [PATCH] TT#11544 wni: add projectname to the WF message Change-Id: Idcfaeeecfdc3d46398592d64304918c064ae994b --- repoapi/models/wni.py | 9 +++++---- repoapi/test/test_workfrontnote.py | 12 ++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/repoapi/models/wni.py b/repoapi/models/wni.py index c665a5c..81f6670 100644 --- a/repoapi/models/wni.py +++ b/repoapi/models/wni.py @@ -91,9 +91,10 @@ def workfront_note_manage(sender, **kwargs): if instance.jobname.endswith("-get-code") and \ instance.result == "SUCCESS": if instance.gerrit_eventtype == 'change-merged': - msg = "[%s] review merged" + msg = "%s[%s] review merged" elif instance.gerrit_eventtype == 'patchset-created': - msg = "[%s] review created" + msg = "%s[%s] review created" else: - msg = "[%s] commit created" - workfront_note_add(instance, msg % (instance.param_branch)) + msg = "%s[%s] commit created" + workfront_note_add(instance, msg % (instance.projectname, + instance.param_branch)) diff --git a/repoapi/test/test_workfrontnote.py b/repoapi/test/test_workfrontnote.py index e304a7d..8ded622 100644 --- a/repoapi/test/test_workfrontnote.py +++ b/repoapi/test/test_workfrontnote.py @@ -83,7 +83,8 @@ class WorkfrontNoteTestCase(BaseTest): workfront_id="0001", gerrit_change="2054") self.assertEquals(gri.count(), 1) - msg = "[%s] review created %s " % ( + msg = "%s[%s] review created %s " % ( + param['projectname'], param['param_branch'], settings.GERRIT_URL.format("2054")) utils.assert_called_once_with("0001", msg) @@ -111,7 +112,8 @@ class WorkfrontNoteTestCase(BaseTest): workfront_id="0001", gerrit_change="7fg4567") self.assertEquals(gri.count(), 0) - msg = "[%s] review created %s " % ( + msg = "%s[%s] review created %s " % ( + param['projectname'], param['param_branch'], settings.GERRIT_URL.format("2054")) utils.assert_called_once_with("0001", msg) @@ -130,7 +132,8 @@ class WorkfrontNoteTestCase(BaseTest): workfront_id="0001", gerrit_change="2054") self.assertEquals(gri.count(), 2) - msg = "[%s] review merged %s " % ( + msg = "%s[%s] review merged %s " % ( + param['projectname'], param['param_branch'], settings.GERRIT_URL.format("2054")) utils.assert_called_with("0001", msg) @@ -154,7 +157,8 @@ class WorkfrontNoteTestCase(BaseTest): workfront_id="0001", gerrit_change="7fg4567") self.assertEquals(gri.count(), 1) - msg = "[%s] commit created %s " % ( + msg = "%s[%s] commit created %s " % ( + param['projectname'], param['param_branch'], settings.GITWEB_URL.format("kamailio", "7fg4567")) utils.assert_called_once_with("0001", msg)