Cleanup xvfb on exit.

1 files changed, 14 insertions, 8 deletions

diff --git a/scripts/check.py b/scripts/check.py
index c8628be..79396cf 100644
--- a/scripts/check.py
+++ b/scripts/check.py
@@ -2,6 +2,7 @@ import os
 import sys
 from optparse import make_option
 import random
+import signal
 import subprocess
 
 from jhbuild.commands import Command, register_command
@@ -30,13 +31,16 @@ class cmd_check(Command):
             port = ':%d' % random.randrange(100, 1000)
 
         try:
-            subprocess.Popen(['Xvfb', '-ac', port],
-                             stdout=open(os.devnull, "w"),
-                             stderr=subprocess.STDOUT)
+            p = subprocess.Popen(['Xvfb', '-ac', port],
+                                 stdout=open(os.devnull, "w"),
+                                 stderr=subprocess.STDOUT)
             os.environ['DISPLAY'] = port
+            return p.pid
         except OSError:
             print 'Cannot execute xfvb, will use the default display.'
 
+        return None
+
     def lint(self, module):
         subprocess.call(['pylint', module, '--rcfile=%s' % pylintrc_path])
 
@@ -68,11 +72,13 @@ class cmd_check(Command):
         print 'Done.'
 
     def run(self, config, options, args):
-        self.start_xvfb(options.xvfb_port)
+        xvfb_pid = self.start_xvfb(options.xvfb_port)
 
-        if options.type == 'pylint':
-            self.check_pylint(config)
-        else:
-            return False
+        try:
+            if options.type == 'pylint':
+                self.check_pylint(config)
+        finally:
+            if xvfb_pid:
+                os.kill(xvfb_pid, signal.SIGTERM)
 
 register_command(cmd_check)