diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2013-02-15 21:38:12 +1300 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2013-02-15 21:38:12 +1300 |
commit | 57670503a4b7654245390dfa48017f92be7a7f75 (patch) | |
tree | bc4d6c1ed23865258819867ca7c0917130977b37 /tests | |
parent | 41ba4ebb9e2230a627d3158e84b50f84018ddc6a (diff) | |
download | lightdm-57670503a4b7654245390dfa48017f92be7a7f75.tar.gz |
Fix python greeter crashing on sigterm
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/src/test-python-greeter | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter index b9c0f23f..44c3e482 100755 --- a/tests/src/test-python-greeter +++ b/tests/src/test-python-greeter @@ -12,21 +12,19 @@ from gi.repository import LightDM loop = GLib.MainLoop () def sigterm_cb (data): - status_notify ('GREETER %s TERMINATE SIGNAL=%d' % (os.getenv ('DISPLAY'), signum)) + status_notify ('GREETER %s TERMINATE SIGNAL=%d' % (os.getenv ('DISPLAY'), signal.SIGTERM)) loop.quit () GLib.unix_signal_add (GLib.PRIORITY_DEFAULT, signal.SIGTERM, sigterm_cb, None) status_socket = None def status_notify (message): - sys.stderr.write ("status_notify\n"); if status_socket is not None: status_socket.send (struct.pack ('i', len (message)) + message) else: sys.stderr.write ('%s\n' % message) def request_cb (channel, condition): - sys.stderr.write ("request_cb\n") length = status_socket.recv (4) if len (length) == 0: loop.quit (); @@ -61,11 +59,8 @@ def request_cb (channel, condition): r = 'GREETER %s START-SESSION' % os.getenv ('DISPLAY') if request == r: - sys.stderr.write ("start-session\n"); if not greeter.start_session_sync (None): - sys.stderr.write ("start-session-failed\n"); status_notify ('GREETER %s SESSION-FAILED' % os.getenv ('DISPLAY')) - sys.stderr.write ("start-session ok\n"); r = 'GREETER %s START-SESSION SESSION=' % os.getenv ('DISPLAY') if request.startswith (r): @@ -95,7 +90,6 @@ def request_cb (channel, condition): language = '' status_notify ('GREETER %s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s' % (os.getenv ('DISPLAY'), username, language)) - sys.stderr.write ("request_cb end\n") return True path = os.getenv ('LIGHTDM_TEST_ROOT') + '/.status-socket' |