09cdaa4 · unity8 · git.iko.soy

on xenial help sign in

Upstart takes care of starting / stopping maliit for us.

09cdaa4Michał Sawicz13 years ago

tests/autopilot/unity8/shell/tests/__init__.py−16

@@ -286,22 +286,6 @@ class UnityTestCase(AutopilotTestCase):

286 )

287

288 def _cleanup_launching_upstart_unity(self):

289− logger.info("Cleaning up launching unity")

290−

291− # FIXME: Workaround for issue: lp:1239491

292− if model() != "Desktop":

293− logger.info("Stopping maliit-server before unity.")

294− try:

295− subprocess.check_call([

296− "/sbin/initctl",

297− "stop",

298− "maliit-server"

299− ], stderr=subprocess.STDOUT)

300− except subprocess.CalledProcessError:

301− logger.warning(

302− "Appears that maliit-server was already stopped!"

303− )

304−

305 logger.info("Stopping unity")

289 logger.info("Stopping unity")

306 try:

290 try:

307 subprocess.check_call(["/sbin/initctl", "stop", "unity8"], stderr=subprocess.STDOUT)

291 subprocess.check_call(["/sbin/initctl", "stop", "unity8"], stderr=subprocess.STDOUT)