software/theia/test: simplify a test by using self.addCleanup

software/theia/test/test.py

@@ -391,7 +391,9 @@ class TestTheiaEnv(TheiaTestCase):
     # Start a theia shell that inherits the environment of the theia process
     # This simulates the environment of a shell launched from the browser application
     theia_shell_process = pexpect.spawnu('{}/bin/theia-shell'.format(self.getPath()), env=theia_env)
-    try:
+    self.addCleanup(theia_shell_process.wait)
+    self.addCleanup(theia_shell_process.terminate)
+
     theia_shell_process.expect_exact('Standalone SlapOS for computer `slaprunner` activated')
 
     # Launch slapos node software from theia shell
@@ -433,11 +435,6 @@ class TestTheiaEnv(TheiaTestCase):
     self.assertEqual(theia_shell_env['SLAPOS_CLIENT_CONFIGURATION'], supervisord_env['SLAPOS_CLIENT_CONFIGURATION'])
     self.assertEqual(theia_shell_env['HOME'], supervisord_env['HOME'])
 
-    finally:
-      # Cleanup the theia shell process
-      theia_shell_process.terminate()
-      theia_shell_process.wait()
-
 
 class ResilientTheiaMixin(object):
   @classmethod