Setup main_loop inside BuildExecutor

Author: manics

binderhub/build.py

@@ -14,6 +14,7 @@
 
 import kubernetes.config
 from kubernetes import client, watch
+from tornado.ioloop import IOLoop
 from tornado.log import app_log
 from traitlets import Any, Bool, CUnicode, Dict, Integer, Unicode, default
 from traitlets.config import LoggingConfigurable
@@ -104,6 +105,10 @@ class BuildExecutor(LoggingConfigurable):
 
     main_loop = Any(allow_none=False)
 
+    @default("main_loop")
+    def _default_main_loop(self):
+        return IOLoop.current()
+
     stop_event = Any()
 
     @default("stop_event")

binderhub/builder.py

@@ -447,7 +447,6 @@ async def get(self, provider_prefix, _unescaped_spec):
                 git_credentials=provider.git_credentials,
                 sticky_builds=self.settings["sticky_builds"],
             )
-            build.main_loop = IOLoop.current()
         else:
             build = BuildClass(
                 # Commented properties should be set in traitlets config
@@ -468,7 +467,6 @@ async def get(self, provider_prefix, _unescaped_spec):
                 # log_tail_lines=self.settings["log_tail_lines"],
                 git_credentials=provider.git_credentials,
                 # sticky_builds=self.settings["sticky_builds"],
-                main_loop=IOLoop.current(),
             )
         self.build = build
 

binderhub/tests/test_build.py

@@ -215,8 +215,7 @@ def test_git_credentials_passed_to_podspec_upon_submit():
     assert env["GIT_CREDENTIAL_ENV"] == str(git_credentials)
 
 
-async def test_local_repo2docker_build(io_loop):
-    io_loop = await io_loop
+async def test_local_repo2docker_build():
     q = Queue()
     repo_url = "https://github.com/binderhub-ci-repos/cached-minimal-dockerfile"
     ref = "HEAD"
@@ -228,7 +227,6 @@ async def test_local_repo2docker_build(io_loop):
         repo_url=repo_url,
         ref=ref,
         image_name=name,
-        main_loop=io_loop,
     )
     build.submit()
 
@@ -263,7 +261,6 @@ async def test_local_repo2docker_build_stop(io_loop):
         repo_url=repo_url,
         ref=ref,
         image_name=name,
-        main_loop=io_loop,
     )
     io_loop.run_in_executor(None, build.submit)