Adjust master_gen.PopulateBuildmasterConfig() to look at master_site_config

scripts/master/unittests/master_gen_test.py

Index: scripts/master/unittests/master_gen_test.py
diff --git a/scripts/master/unittests/master_gen_test.py b/scripts/master/unittests/master_gen_test.py
index 168a75eb829e45bf4c060b3f2867ca94cd9c3924..c1680f133ca9533a0a71958b692ee9de3091db27 100755
--- a/scripts/master/unittests/master_gen_test.py
+++ b/scripts/master/unittests/master_gen_test.py
@@ -29,7 +29,7 @@ SAMPLE_BUILDERS_PY = """\
     }
   },
   "git_repo_url": "https://chromium.googlesource.com/test/test.git",
-  "master_base_class": "_FakeMaster",
+  "master_base_class": "_FakeMasterBase",
   "master_port": 20999,
   "master_port_alt": 40999,
   "master_type": "waterfall",
@@ -49,16 +49,21 @@ SAMPLE_BUILDERS_PY = """\
 """
 
 
-class _FakeMaster(object):
+# This class fakes the base class from master_site_config.py.
+class _FakeMasterBase(object):
   in_production = False
   is_production_host = False
+
+
+# This class fakes the actual master class in master_site_config.py.
+class _FakeMaster(_FakeMasterBase):
   project_name = 'test'
-  project_url = 'https://example.com/'
+  master_port = '20999'
+  slave_port = '30999'
+  master_port_alt = '40999'
+  buildbot_url = 'https://build.chromium.org/p/test'
   buildbucket_bucket = None
-
-  @classmethod
-  def GetBotPassword(cls):
-    return ''
+  service_account_file = None
 
 
 class PopulateBuildmasterConfigTest(unittest.TestCase):
@@ -68,7 +73,6 @@ class PopulateBuildmasterConfigTest(unittest.TestCase):
       fp.write(SAMPLE_BUILDERS_PY)
       fp.close()
 
-      setattr(_FakeMaster, '_FakeMaster', _FakeMaster)
       c = {}
       master_gen.PopulateBuildmasterConfig(c, fp.name, _FakeMaster)
 
@@ -87,7 +91,6 @@ class PopulateBuildmasterConfigTest(unittest.TestCase):
       fp.write(contents)
       fp.close()
 
-      setattr(_FakeMaster, '_FakeMaster', _FakeMaster)
       c = {}
       master_gen.PopulateBuildmasterConfig(c, fp.name, _FakeMaster)