From 71b8281ee169f596fae6614f6b4b04d7f78d06be Mon Sep 17 00:00:00 2001
From: Bryce Adelstein-Lelbach <blelbach@cct.lsu.edu>
Date: Fri, 28 Sep 2012 17:05:20 -0500
Subject: [PATCH] Implement requested change to from a <pre> to a <div> for
 builder descriptions, fix tests broken by addition of builder descriptions.

---
 master/buildbot/config.py                           |  2 ++
 master/buildbot/status/web/templates/builder.html   |  2 +-
 master/buildbot/test/fake/fakemaster.py             |  2 +-
 master/buildbot/test/unit/test_config.py            | 13 +++++++++----
 .../buildbot/test/unit/test_status_builder_cache.py |  4 ++--
 master/buildbot/test/unit/test_status_buildstep.py  |  4 ++--
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/master/buildbot/config.py b/master/buildbot/config.py
index afae42f4dd2..6180abd4b9b 100644
--- a/master/buildbot/config.py
+++ b/master/buildbot/config.py
@@ -714,6 +714,8 @@ def getConfigDict(self):
             rv['properties'] = self.properties
         if self.mergeRequests:
             rv['mergeRequests'] = self.mergeRequests
+        if self.description:
+            rv['description'] = self.description
         return rv
 
 
diff --git a/master/buildbot/status/web/templates/builder.html b/master/buildbot/status/web/templates/builder.html
index f02e6c99caf..4d481b9dff9 100644
--- a/master/buildbot/status/web/templates/builder.html
+++ b/master/buildbot/status/web/templates/builder.html
@@ -9,7 +9,7 @@ <h1>Builder {{ name }}</h1>
 <p>(<a href="{{ path_to_root }}waterfall?show={{ name }}">view in waterfall</a>)</p>
 
 {% if description %}
-  <pre>{{ description }}</pre>
+  <div class="BuilderDescription">{{ description }}</div>
 {% endif %}
 
 <div class="column">
diff --git a/master/buildbot/test/fake/fakemaster.py b/master/buildbot/test/fake/fakemaster.py
index 9e0efb5f291..7424311f243 100644
--- a/master/buildbot/test/fake/fakemaster.py
+++ b/master/buildbot/test/fake/fakemaster.py
@@ -50,7 +50,7 @@ class FakeBotMaster(object):
 
 class FakeStatus(object):
 
-    def builderAdded(self, name, basedir, category=None):
+    def builderAdded(self, name, basedir, category=None, description=None):
         return FakeBuilderStatus()
 
 
diff --git a/master/buildbot/test/unit/test_config.py b/master/buildbot/test/unit/test_config.py
index c5646b30c51..2faaf5a99b3 100644
--- a/master/buildbot/test/unit/test_config.py
+++ b/master/buildbot/test/unit/test_config.py
@@ -956,14 +956,16 @@ def test_defaults(self):
             locks=[],
             env={},
             properties={},
-            mergeRequests=None)
+            mergeRequests=None,
+            description=None)
 
     def test_args(self):
         cfg = config.BuilderConfig(
             name='b', slavename='s1', slavenames='s2', builddir='bd',
             slavebuilddir='sbd', factory=self.factory, category='c',
             nextSlave=lambda : 'ns', nextBuild=lambda : 'nb', locks=['l'],
-            env=dict(x=10), properties=dict(y=20), mergeRequests='mr')
+            env=dict(x=10), properties=dict(y=20), mergeRequests='mr',
+            description='buzz')
         self.assertIdentical(cfg.factory, self.factory)
         self.assertAttributes(cfg,
             name='b',
@@ -974,7 +976,8 @@ def test_args(self):
             locks=['l'],
             env={'x':10},
             properties={'y':20},
-            mergeRequests='mr')
+            mergeRequests='mr',
+            description='buzz')
 
     def test_getConfigDict(self):
         ns = lambda : 'ns'
@@ -983,9 +986,11 @@ def test_getConfigDict(self):
             name='b', slavename='s1', slavenames='s2', builddir='bd',
             slavebuilddir='sbd', factory=self.factory, category='c',
             nextSlave=ns, nextBuild=nb, locks=['l'],
-            env=dict(x=10), properties=dict(y=20), mergeRequests='mr')
+            env=dict(x=10), properties=dict(y=20), mergeRequests='mr',
+            description='buzz')
         self.assertEqual(cfg.getConfigDict(), {'builddir': 'bd',
             'category': 'c',
+            'description': 'buzz',
             'env': {'x': 10},
             'factory': self.factory,
             'locks': ['l'],
diff --git a/master/buildbot/test/unit/test_status_builder_cache.py b/master/buildbot/test/unit/test_status_builder_cache.py
index c129f681056..4e7a36f70a0 100644
--- a/master/buildbot/test/unit/test_status_builder_cache.py
+++ b/master/buildbot/test/unit/test_status_builder_cache.py
@@ -24,10 +24,10 @@ class TestBuildStatus(unittest.TestCase):
     # that buildstep.BuildStepStatus is never instantiated here should tell you
     # that these classes are not well isolated!
 
-    def setupBuilder(self, buildername, category=None):
+    def setupBuilder(self, buildername, category=None, description=None):
         m = fakemaster.make_master()
         b = builder.BuilderStatus(buildername=buildername, category=category,
-                                    master=m)
+                                    master=m, description=description)
         # Awkwardly, Status sets this member variable.
         b.basedir = os.path.abspath(self.mktemp())
         os.mkdir(b.basedir)
diff --git a/master/buildbot/test/unit/test_status_buildstep.py b/master/buildbot/test/unit/test_status_buildstep.py
index c438437f814..44e2d504e26 100644
--- a/master/buildbot/test/unit/test_status_buildstep.py
+++ b/master/buildbot/test/unit/test_status_buildstep.py
@@ -23,11 +23,11 @@ class TestBuildStepStatus(unittest.TestCase):
     # that buildstep.BuildStepStatus is never instantiated here should tell you
     # that these classes are not well isolated!
 
-    def setupBuilder(self, buildername, category=None):
+    def setupBuilder(self, buildername, category=None, description=None):
         self.master = fakemaster.make_master()
         self.master.basedir = '/basedir'
 
-        b = builder.BuilderStatus(buildername, self.master, category)
+        b = builder.BuilderStatus(buildername, self.master, category, description)
         b.master = self.master
         # Ackwardly, Status sets this member variable.
         b.basedir = os.path.abspath(self.mktemp())