replace TensorBoardWSGIApp in plugin tests with TensorBoardWSGI and explicit Reload()

Author: nfelt

tensorboard/plugins/audio/audio_plugin_test.py

@@ -92,18 +92,12 @@ def setUp(self):
         "foo": foo_directory,
         "bar": bar_directory,
     })
+    multiplexer.Reload()
     context = base_plugin.TBContext(
         logdir=self.log_dir, multiplexer=multiplexer)
     self.plugin = audio_plugin.AudioPlugin(context)
-    # Setting a reload interval of -1 disables reloading. We disable reloading
-    # because we seek to block tests from running til after one reload finishes.
-    # This setUp method thus manually reloads the multiplexer. TensorBoard would
-    # otherwise reload in a non-blocking thread.
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [self.plugin], multiplexer, reload_interval=-1,
-        path_prefix='')
+    wsgi_app = application.TensorBoardWSGI([self.plugin])
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
-    multiplexer.Reload()
 
   def tearDown(self):
     shutil.rmtree(self.log_dir, ignore_errors=True)

tensorboard/plugins/core/core_plugin_test.py

@@ -302,12 +302,7 @@ def _start_logdir_based_server(self, temp_dir):
         multiplexer=self.multiplexer,
         window_title='title foo')
     self.logdir_based_plugin = core_plugin.CorePlugin(context)
-    app = application.TensorBoardWSGIApp(
-        self.logdir,
-        [self.logdir_based_plugin],
-        self.multiplexer,
-        0,
-        path_prefix='')
+    app = application.TensorBoardWSGI([self.logdir_based_plugin])
     self.logdir_based_server = werkzeug_test.Client(app, wrappers.BaseResponse)
 
   def _start_db_based_server(self):

tensorboard/plugins/debugger/debugger_plugin_testlib.py

@@ -120,10 +120,11 @@ def setUp(self):
     writer.Close()
 
     # Start a server that will receive requests and respond with health pills.
-    self.multiplexer = event_multiplexer.EventMultiplexer({
+    multiplexer = event_multiplexer.EventMultiplexer({
         '.': self.log_dir,
         'run_foo': run_foo_directory,
     })
+    multiplexer.Reload()
     self.debugger_data_server_grpc_port = portpicker.pick_unused_port()
 
     # Fake threading behavior so that threads are synchronous.
@@ -141,12 +142,10 @@ def setUp(self):
         self.mock_debugger_data_server_class).start()
 
     self.context = base_plugin.TBContext(
-        logdir=self.log_dir, multiplexer=self.multiplexer)
+        logdir=self.log_dir, multiplexer=multiplexer)
     self.plugin = debugger_plugin.DebuggerPlugin(self.context)
     self.plugin.listen(self.debugger_data_server_grpc_port)
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [self.plugin], self.multiplexer, reload_interval=0,
-        path_prefix='')
+    wsgi_app = application.TensorBoardWSGI([self.plugin])
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
     # The debugger data server should be started at the correct port.

tensorboard/plugins/debugger/interactive_debugger_plugin_test.py

@@ -55,21 +55,16 @@ def setUp(self):
     super(InteractiveDebuggerPluginTest, self).setUp()
 
     self._dummy_logdir = tempfile.mkdtemp()
-    self._dummy_multiplexer = event_multiplexer.EventMultiplexer({})
+    dummy_multiplexer = event_multiplexer.EventMultiplexer({})
     self._debugger_port = portpicker.pick_unused_port()
     self._debugger_url = 'grpc://localhost:%d' % self._debugger_port
     context = base_plugin.TBContext(logdir=self._dummy_logdir,
-                                    multiplexer=self._dummy_multiplexer)
+                                    multiplexer=dummy_multiplexer)
     self._debugger_plugin = (
         interactive_debugger_plugin.InteractiveDebuggerPlugin(context))
     self._debugger_plugin.listen(self._debugger_port)
 
-    wsgi_app = application.TensorBoardWSGIApp(
-        self._dummy_logdir,
-        [self._debugger_plugin],
-        self._dummy_multiplexer,
-        reload_interval=0,
-        path_prefix='')
+    wsgi_app = application.TensorBoardWSGI([self._debugger_plugin])
     self._server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
   def tearDown(self):

tensorboard/plugins/image/images_plugin_test.py

@@ -86,17 +86,12 @@ def setUp(self):
         "foo": foo_directory,
         "bar": bar_directory,
     })
+    multiplexer.Reload()
     context = base_plugin.TBContext(
         logdir=self.log_dir, multiplexer=multiplexer)
     plugin = images_plugin.ImagesPlugin(context)
-    # Setting a reload interval of -1 disables reloading. We disable reloading
-    # because we seek to block tests from running til after one reload finishes.
-    # This setUp method thus manually reloads the multiplexer. TensorBoard would
-    # otherwise reload in a non-blocking thread.
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [plugin], multiplexer, reload_interval=-1, path_prefix='')
+    wsgi_app = application.TensorBoardWSGI([plugin])
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
-    multiplexer.Reload()
     self.routes = plugin.get_plugin_apps()
 
   def tearDown(self):

tensorboard/plugins/interactive_inference/interactive_inference_plugin_test.py

@@ -54,11 +54,7 @@ def setUp(self):
     self.context = base_plugin.TBContext(logdir=self.logdir)
     self.plugin = interactive_inference_plugin.InteractiveInferencePlugin(
         self.context)
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.logdir, [self.plugin],
-        multiplexer=event_multiplexer.EventMultiplexer({}),
-        reload_interval=0,
-        path_prefix='')
+    wsgi_app = application.TensorBoardWSGI([self.plugin])
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
   def get_fake_example(self, single_int_value=0):

tensorboard/plugins/mesh/mesh_plugin_test.py

@@ -129,13 +129,12 @@ def setUp(self):
     self.context = base_plugin.TBContext(
         logdir=self.log_dir, multiplexer=self.multiplexer)
     self.plugin = mesh_plugin.MeshPlugin(self.context)
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [self.plugin],
-        self.multiplexer,
-        reload_interval=0,
-        path_prefix="")
-    self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
+    # Wait until after plugin construction to reload the multiplexer because the
+    # plugin caches data from the multiplexer upon construction and this affects
+    # logic tested later down.
     self.multiplexer.Reload()
+    wsgi_app = application.TensorBoardWSGI([self.plugin])
+    self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
     self.routes = self.plugin.get_plugin_apps()
 
   def tearDown(self):

tensorboard/plugins/projector/projector_plugin_test.py

@@ -273,9 +273,7 @@ def _SetupWSGIApp(self):
     context = base_plugin.TBContext(
         logdir=self.log_dir, multiplexer=multiplexer)
     self.plugin = projector_plugin.ProjectorPlugin(context)
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [self.plugin], multiplexer, reload_interval=0,
-        path_prefix='')
+    wsgi_app = application.TensorBoardWSGI([self.plugin])
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
   def _Get(self, path):