TestSession now does its own signal handling.

1 files changed, 2 insertions, 8 deletions

diff --git a/gpsfake b/gpsfake
index b6ecd8e6..9fe13649 100755
--- a/gpsfake
+++ b/gpsfake
@@ -101,9 +101,6 @@ test = gpsfake.TestSession(prefix=monitor, options=doptions)
 if pipe:
     test.reporter = sys.stdout.write
 
-signal.signal(signal.SIGQUIT, lambda sig, frame: test.killall())
-signal.signal(signal.SIGINT, lambda sig, frame: test.killall())
-
 try:
     test.gps_add(logfile, speed=speed, pred=fakehook)
 except gpsfake.PacketError, e:
@@ -116,11 +113,8 @@ except OSError:
     sys.stderr.write("gpsfake: can't open pty.\n")
     raise SystemExit, 1
 
-try:
-    test.client_add("w+r+\n")
-    test.cleanup();
-except KeyboardInterrupt:
-    test.killall()
+test.client_add("w+r+\n")
+test.cleanup();
 
 if progress:
     baton.end()