eb83b87 · unity8 · git.iko.soy

on xenial help sign in

Suppress output from initctl and add logging on unity8 startup.

eb83b87Michał Sawicz13 years ago

tests/autopilot/unity8/shell/tests/__init__.py+2−1

@@ -263,6 +263,7 @@ class UnityTestCase(AutopilotTestCase):

263 return app_proxy

264

265 def _launch_unity_with_upstart(self, binary_path, args):

266+ logger.info("Starting unity")

266 self._patch_environment("QT_LOAD_TESTABILITY", 1)

267 self._patch_environment("QT_LOAD_TESTABILITY", 1)

267

268

268 binary_arg = "BINARY=%s" % binary_path

269 binary_arg = "BINARY=%s" % binary_path

@@ -289,7 +290,7 @@ class UnityTestCase(AutopilotTestCase):

289 def _cleanup_launching_upstart_unity(self):

290 def _cleanup_launching_upstart_unity(self):

290 logger.info("Stopping unity")

291 logger.info("Stopping unity")

291 try:

292 try:

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

293+ subprocess.check_output(["/sbin/initctl", "stop", "unity8"], stderr=subprocess.STDOUT)

293 except subprocess.CalledProcessError:

294 except subprocess.CalledProcessError:

294 logger.warning("Appears unity was already stopped!")

295 logger.warning("Appears unity was already stopped!")

295

296