From ad9f10a9aca6dd3e2569de5b96e0bc14dd327d91 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 18 May 2018 12:23:09 +1200
Subject: [PATCH] try to ensure that functions run in the background have
 "_bg_" in their name

---
 subiquity/controllers/installprogress.py |  4 ++--
 subiquitycore/controllers/network.py     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py
index 82e39a21..154ffb60 100644
--- a/subiquity/controllers/installprogress.py
+++ b/subiquity/controllers/installprogress.py
@@ -76,7 +76,7 @@ class InstallProgressController(BaseController):
         self.progress_view.show_complete(True)
         self.default()
 
-    def run_command_logged(self, cmd, env):
+    def _bg_run_command_logged(self, cmd, env):
         log.debug("running %s", cmd)
         cmd = ['systemd-cat', '--level-prefix=false', '--identifier=' + self._log_syslog_identifier] + cmd
         cp = subprocess.run(cmd, env=env)
@@ -171,7 +171,7 @@ class InstallProgressController(BaseController):
         if 'SNAP' in env:
             del env['SNAP']
         self.run_in_bg(
-            lambda: self.run_command_logged(curtin_cmd, env),
+            lambda: self._bg_run_command_logged(curtin_cmd, env),
             self.curtin_install_completed)
 
     def curtin_install_completed(self, fut):
diff --git a/subiquitycore/controllers/network.py b/subiquitycore/controllers/network.py
index b4252092..dd767833 100644
--- a/subiquitycore/controllers/network.py
+++ b/subiquitycore/controllers/network.py
@@ -51,7 +51,7 @@ class BackgroundTask:
         """
         raise NotImplementedError(self.start)
 
-    def run(self):
+    def _bg_run(self):
         """Run the task.
 
         This is called on an arbitrary thread so don't do UI stuff!
@@ -89,7 +89,7 @@ class BackgroundProcess(BackgroundTask):
     def start(self):
         self.proc = run_command_start(self.cmd)
 
-    def run(self):
+    def _bg_run(self):
         stdout, stderr = self.proc.communicate()
         return run_command_summarize(self.proc, stdout, stderr)
 
@@ -121,7 +121,7 @@ class PythonSleep(BackgroundTask):
     def start(self):
         pass
 
-    def run(self):
+    def _bg_run(self):
         r, _, _ = select.select([self.r], [], [], self.duration)
         if not r:
             return True
@@ -156,7 +156,7 @@ class DownNetworkDevices(BackgroundTask):
                 # We don't actually care very much about this
                 log.exception('unset_link_flags failed for %s', dev.name)
 
-    def run(self):
+    def _bg_run(self):
         return True
 
     def end(self, observer, fut):
@@ -186,7 +186,7 @@ class WaitForDefaultRouteTask(BackgroundTask):
         self.success_r, self.success_w = os.pipe()
         self.event_receiver.add_default_route_waiter(self.got_route)
 
-    def run(self):
+    def _bg_run(self):
         try:
             r, _, _ = select.select([self.fail_r, self.success_r], [], [], self.timeout)
             return self.success_r in r
@@ -229,7 +229,7 @@ class TaskSequence:
         self.tasks = self.tasks[1:]
         log.debug('running %s for stage %s', self.curtask, self.stage)
         self.curtask.start()
-        self.run_in_bg(self.curtask.run, lambda fut:self.curtask.end(self, fut))
+        self.run_in_bg(self.curtask._bg_run, lambda fut:self.curtask.end(self, fut))
 
     def task_succeeded(self):
         if self.canceled: