Update buildbot_tool and builders.pyl templates to remove 'master_type'.

scripts/master/unittests/master_gen_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tests for scripts/master/master_gen.py."""
 
 import os
 import tempfile
 import unittest
@@ skipping 66 matching lines @@
       master_gen.PopulateBuildmasterConfig(c, fp.name, _FakeMaster)
 
       self.assertEqual(len(c['builders']), 1)
       self.assertEqual(c['builders'][0]['name'], 'Test Linux')
 
       self.assertEqual(len(c['change_source']), 1)
       self.assertEqual(len(c['schedulers']), 1)
     finally:
       os.remove(fp.name)
 
-  def test_tryserver(self):

[Dirk Pranke, 2015/05/29 01:55:38]

We'll add an equivalent test back in the follow up patch, but in this CL it
wasn't testing anything interesting.

-    try:
-      contents = SAMPLE_BUILDERS_PY.replace('waterfall', 'tryserver')
-      fp = tempfile.NamedTemporaryFile(delete=False)
-      fp.write(contents)
-      fp.close()
-
-      c = {}
-      master_gen.PopulateBuildmasterConfig(c, fp.name, _FakeMaster)
-
-      self.assertEqual(len(c['builders']), 1)
-      self.assertEqual(c['builders'][0]['name'], 'Test Linux')
-
-      self.assertEqual(len(c['change_source']), 0)
-      self.assertEqual(len(c['schedulers']), 1)
-    finally:
-      os.remove(fp.name)
-
 
-
 if __name__ == '__main__':
   unittest.TestCase.maxDiff = None
   unittest.main()