Don't add a newline to force-build reasons

And also make MailNotifier a bit more resilient to newlines in the reason. Fixes #2285.
buildbot · Apr 22, 2012 · da0c97e · da0c97e
1 parent 342362f
commit da0c97e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/master/buildbot/schedulers/forcesched.py b/master/buildbot/schedulers/forcesched.py
@@ -283,7 +283,7 @@ def forceWithWebRequest(self, owner, builder_name, req):
 
         real_properties.setProperty("owner", owner, "Force Build Form")
 
-        r = ("The web-page 'force build' button was pressed by '%s': %s\n"
+        r = ("The web-page 'force build' button was pressed by '%s': %s"
              % (owner, reason)) 
 
         d = master.db.sourcestampsets.addSourceStampSet()

diff --git a/master/buildbot/status/mail.py b/master/buildbot/status/mail.py
@@ -496,7 +496,7 @@ def getCustomMesgData(self, mode, name, build, results, master_status):
                  'buildText': build.getText(),
                  'buildProperties': build.getProperties(),
                  'slavename': build.getSlavename(),
-                 'reason':  build.getReason(),
+                 'reason':  build.getReason().replace('\n', ''),
                  'responsibleUsers': build.getResponsibleUsers(),
                  'branch': "",
                  'revision': "",

diff --git a/master/buildbot/test/unit/test_schedulers_forcesched.py b/master/buildbot/test/unit/test_schedulers_forcesched.py
@@ -124,7 +124,7 @@ def check(res):
             self.db.buildsets.assertBuildset\
                 (bsid,
                  dict(reason="The web-page 'force build' button was pressed by"
-                            " 'user': because\n",
+                            " 'user': because",
                       brids=brids,
                       external_idstring=None,
                       properties=[ ('owner', ('user', 'Force Build Form')),
@@ -160,7 +160,7 @@ def check(res):
             self.db.buildsets.assertBuildset\
                 (bsid,
                  dict(reason="The web-page 'force build' button was pressed "
-                             "by 'user': because\n",
+                             "by 'user': because",
                       brids=brids,
                       external_idstring=None,
                       properties=[