diff --git a/master/buildbot/test/unit/www/test_config.py b/master/buildbot/test/unit/www/test_config.py index e3362feec830..1a6b0de230fa 100644 --- a/master/buildbot/test/unit/www/test_config.py +++ b/master/buildbot/test/unit/www/test_config.py @@ -83,7 +83,7 @@ def test_render(self): self.assertEqual(res, exp) -class IndexResourceReactTest(TestReactorMixin, www.WwwTestMixin, unittest.TestCase): +class IndexResourceTest(TestReactorMixin, www.WwwTestMixin, unittest.TestCase): def setUp(self): self.setup_test_reactor() @@ -135,10 +135,10 @@ def test_render(self, name, user_info, expected_user): if user_info is not None: master.session.user_info = user_info - # IndexResourceReact only uses static path to get index.html. In the source checkout + # IndexResource only uses static path to get index.html. In the source checkout # index.html resides not in www/base/public but in www/base. Thus - # base path is sent to IndexResourceReact. - rsrc = config.IndexResourceReact(master, self.get_react_base_path()) + # base path is sent to IndexResource. + rsrc = config.IndexResource(master, self.get_react_base_path()) rsrc.reconfigResource(master.config) vjson = [list(v) for v in config.get_environment_versions()] + custom_versions diff --git a/master/buildbot/www/config.py b/master/buildbot/www/config.py index 5d1364a80007..31a5e236f189 100644 --- a/master/buildbot/www/config.py +++ b/master/buildbot/www/config.py @@ -137,7 +137,7 @@ def do_render(self, request): ) -class IndexResourceReact(resource.Resource): +class IndexResource(resource.Resource): # enable reconfigResource calls needsReconfig = True diff --git a/master/buildbot/www/service.py b/master/buildbot/www/service.py index 44321ba2d14e..9635ff40ce72 100644 --- a/master/buildbot/www/service.py +++ b/master/buildbot/www/service.py @@ -323,9 +323,7 @@ def setupSite(self, new_config): # / root.putChild( b'', - wwwconfig.IndexResourceReact( - self.master, self.apps.get(self.base_plugin_name).static_dir - ), + wwwconfig.IndexResource(self.master, self.apps.get(self.base_plugin_name).static_dir), ) # /auth