Rename a few variables and greatly reduce the amount of data sent for steps* events

pylibs/buildbot/test/test_web_status_json.py

 # -*- test-case-name: buildbot.test.test_web_status_json -*-
 # -*- coding: utf-8 -*-
 
 import os, shutil
 
 from twisted.python import components
 from twisted.trial import unittest
 from twisted.web import client, error
 
 from buildbot import master, interfaces
@@ skipping 32 matching lines @@
 
 BuildmasterConfig = c = {
     'change_source': PBChangeSource(),
     'slaves': [BuildSlave('bot1name', 'bot1passwd')],
     'schedulers': [Scheduler('name', None, 60, ['builder1'])],
     'slavePortnum': 0,
     }
 c['builders'] = [
     BuilderConfig(name='builder1', slavename='bot1name', factory=BuildFactory()),
 ]
+c['slavePortnum'] = 0
+c['projectUrl'] = 'example.com/yay'
+c['projectName'] = 'Pouet'
+c['buildbotURL'] = 'build.example.com/yo'
 """
 
 
 class TestStatusJson(unittest.TestCase):
     def setUp(self):
         config = base_config + "c['status'] = [html.WebStatus(http_port=0)]\n"
         if os.path.isdir('test_web1'):
             shutil.rmtree('test_web1')
         os.mkdir('test_web1')
         self.master = ConfiguredMaster('test_web1', config)
@@ skipping 20 matching lines @@
         d = client.getPage('http://localhost:%d%s' % (self.port, url))
         if cb:
             d.addCallback(cb)
         if err:
             d.addErrback(err)
         return d
 
     def testPresence(self):
         def _check(page):
             data = json.loads(page)
-            self.assertEqual(len(data), 4)
-            self.assertEqual(len(data['builders']), 1)
-            self.assertEqual(len(data['change_sources']), 1)
-            self.assertEqual(len(data['project']), 2)
-            self.assertEqual(len(data['slaves']), 1)
+            EXPECTED = {
+                'builders': {
+                    'builder1': {
+                        'basedir': 'builder1',
+                        'cachedBuilds': [],
+                        'category': None,
+                        'currentBuilds': [],
+                        'pendingBuilds': [],
+                        'slaves': ['bot1name'],
+                        'state': 'offline'
+                    }
+                },
+                'change_sources': {
+                    '0': {
+                        'description': 'PBChangeSource listener on all-purpose slaveport'
+                    }
+                },
+                'project': {
+                    'buildbotURL': 'build.example.com/yo',
+                    'projectName': 'Pouet',
+                    'projectURL': None
+                },
+                'slaves': {
+                    'bot1name': {
+                        'access_uri': None,
+                        'admin': None,
+                        'builders': {u'builder1': []},
+                        'connected': False,
+                        'host': None,
+                        'name': u'bot1name',
+                        'runningBuilds': [],
+                        'version': None
+                    }
+                }
+            }
+            self.assertEqual(EXPECTED, data)
         return self.getPage('/json', _check)
 
     def testHelp(self):
         def _check(page):
             self.failUnless(page)
         return self.getPage('/json/help', _check)
 
     def testNonPresence(self):
         def _checkOk(page):
             self.assertFalse(page)
         def _checkFail(result):
             self.assertEqual(result.type, error.Error)
         return self.getPage('/json2', _checkOk, _checkFail)
 
 # vim: set ts=4 sts=4 sw=4 et: