runner: cleaned imports

slapos/runner/runnertest.py

@@ -21,13 +21,12 @@ import sup_process
 import time
 import unittest
 
-from slapos.runner.utils import (getProfilePath, getRcode,
+from slapos.runner.utils import (getProfilePath,
                                  getSession, isInstanceRunning,
                                  isSoftwareRunning, startProxy,
                                  isSoftwareReleaseReady,
                                  runSlapgridUntilSuccess,
                                  getBuildAndRunParams, saveBuildAndRunParams)
-from slapos.runner.process import killRunningProcess, isRunning
 from slapos.runner import views
 import slapos.slap
 from slapos.htpasswd import  HtpasswdFile

slapos/runner/sup_process.py

@@ -3,8 +3,6 @@ import signal
 import time
 import xmlrpclib
 
-from supervisor import childutils
-
 # This mini-library is used to communicate with supervisord process
 # It aims to replace the file "process.py"
 # For the moment, we keep both for compatibility

slapos/runner/utils.py

@@ -7,7 +7,6 @@ import datetime
 import json
 import logging
 import md5
-import multiprocessing
 import os
 import sup_process
 import re
@@ -23,7 +22,7 @@ from flask import jsonify
 
 from slapos.runner.gittools import cloneRepo
 
-from slapos.runner.process import Popen, isRunning, killRunningProcess, isPidFileProcessRunning
+from slapos.runner.process import Popen
 from slapos.htpasswd import HtpasswdFile
 import slapos.slap
 from slapos.grid.utils import md5digest

slapos/runner/views.py

@@ -25,8 +25,7 @@ from slapos.runner.utils import (checkSoftwareFolder, configNewSR,
                                  loadSoftwareRList, md5sum, newSoftware,
                                  readFileFrom, readParameters, realpath,
                                  removeInstanceRoot, removeProxyDb,
-                                 removeSoftwareByName, runInstanceWithLock,
-                                 runSoftwareWithLock, runSlapgridUntilSuccess,
+                                 removeSoftwareByName, runSlapgridUntilSuccess,
                                  saveSession, saveBuildAndRunParams,
                                  setMiniShellHistory,
                                  svcStartStopProcess, svcStopAll, tail,