fix(async): rename module to avoid use of reserved keyword

Signed-off-by: Martin Styk <[email protected]>
beaker-project · Oct 28, 2024 · ffbe613 · ffbe613
1 parent 5d60865
commit ffbe613
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/LabController/src/bkr/labcontroller/async.py → ...ller/src/bkr/labcontroller/concurrency.py b/LabController/src/bkr/labcontroller/async.py → ...ller/src/bkr/labcontroller/concurrency.py
diff --git a/LabController/src/bkr/labcontroller/provision.py b/LabController/src/bkr/labcontroller/provision.py
@@ -235,7 +235,7 @@ def handle_clear_netboot(command):
     netboot.clear_all(command['fqdn'])
 
 def handle_power(conf, command):
-    from bkr.labcontroller.async import MonitoredSubprocess
+    from bkr.labcontroller.concurrency import MonitoredSubprocess
     script = find_power_script(command['power']['type'])
     env = build_power_env(command)
     # We try the command up to 5 times, because some power commands

diff --git a/...oller/src/bkr/labcontroller/test_async.py → ...src/bkr/labcontroller/test_concurrency.py b/...oller/src/bkr/labcontroller/test_async.py → ...src/bkr/labcontroller/test_concurrency.py
@@ -18,7 +18,7 @@
     # gevent.wait was gevent.run in 1.0 beta
     # pylint: disable=E0611
     from gevent import run as gevent_wait
-from bkr.labcontroller.async import MonitoredSubprocess
+from bkr.labcontroller.concurrency import MonitoredSubprocess
 
 
 class SubprocessTest(unittest.TestCase):

diff --git a/LabController/src/bkr/labcontroller/watchdog.py b/LabController/src/bkr/labcontroller/watchdog.py
@@ -87,7 +87,7 @@ def get_expired_watchdogs(self):
     def abort(self, recipe_id, system):
         # Don't import this at global scope. It triggers gevent to create its default hub,
         # but we need to ensure the gevent hub is not created until *after* we have daemonized.
-        from bkr.labcontroller.async import MonitoredSubprocess
+        from bkr.labcontroller.concurrency import MonitoredSubprocess
         logger.info('External Watchdog Expired for recipe %s on system %s', recipe_id, system)
         if self.conf.get("WATCHDOG_SCRIPT"):
             job = lxml.etree.fromstring(self.get_my_recipe(dict(recipe_id=recipe_id)))