From 20d3103338d253d09ba7317e6a53310fa9680794 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 21 Feb 2007 11:31:54 -0500 Subject: make separate test scripts for open session methods --- src/ck-manager.c | 1 + src/test-open-session | 44 ++++++++++++++++++++++++++++++++ src/test-open-session-with-parameters | 47 +++++++++++++++++++++++++++++++++++ src/test-session | 47 ----------------------------------- 4 files changed, 92 insertions(+), 47 deletions(-) create mode 100755 src/test-open-session create mode 100755 src/test-open-session-with-parameters delete mode 100755 src/test-session (limited to 'src') diff --git a/src/ck-manager.c b/src/ck-manager.c index bba9b73..6d35347 100644 --- a/src/ck-manager.c +++ b/src/ck-manager.c @@ -483,6 +483,7 @@ create_session_for_caller (CkManager *manager, /* If the parameters are not set then try to get them */ if (parameters == NULL) { + /* FIXME: try to make this complete */ ck_session_set_user (session, uid, NULL); ck_session_set_session_type (session, cmd, NULL); ck_session_set_display_device (session, tty, NULL); diff --git a/src/test-open-session b/src/test-open-session new file mode 100755 index 0000000..66a01dc --- /dev/null +++ b/src/test-open-session @@ -0,0 +1,44 @@ +#!/usr/bin/env python +# +# Test opening a new session +# + +import os +import gobject +import dbus +import dbus.glib + +bus = dbus.SystemBus () + +manager_obj = bus.get_object ('org.freedesktop.ConsoleKit', '/org/freedesktop/ConsoleKit/Manager') + +manager = dbus.Interface (manager_obj, 'org.freedesktop.ConsoleKit.Manager') + +cookie = manager.OpenSession () +os.environ['XDG_SESSION_COOKIE'] = cookie +print "Got cookie: %s" % cookie + +seats = manager.GetSeats () +for sid in seats: + seat_obj = bus.get_object ('org.freedesktop.ConsoleKit', sid) + seat = dbus.Interface (seat_obj, 'org.freedesktop.ConsoleKit.Seat') + sessions = seat.GetSessions () + for ssid in sessions: + session_obj = bus.get_object ('org.freedesktop.ConsoleKit', ssid) + session = dbus.Interface (session_obj, 'org.freedesktop.ConsoleKit.Session') + uid = session.GetUser () + +# Hmm looks like the proc environment doesn't get updated when +# os.environ is set. So, we won't use GetCurrentSession. +#current_session = manager.GetCurrentSession () +current_session = manager.GetSessionForCookie (cookie) +print "Current session: %s" % current_session + +session_obj = bus.get_object ('org.freedesktop.ConsoleKit', ssid) +session = dbus.Interface (session_obj, 'org.freedesktop.ConsoleKit.Session') + +mainloop = gobject.MainLoop () + +gobject.timeout_add (30000, mainloop.quit) + +mainloop.run() diff --git a/src/test-open-session-with-parameters b/src/test-open-session-with-parameters new file mode 100755 index 0000000..72f1ade --- /dev/null +++ b/src/test-open-session-with-parameters @@ -0,0 +1,47 @@ +#!/usr/bin/env python +# +# Test opening a new session +# + +import os +import gobject +import dbus +import dbus.glib + +bus = dbus.SystemBus () + +manager_obj = bus.get_object ('org.freedesktop.ConsoleKit', '/org/freedesktop/ConsoleKit/Manager') + +manager = dbus.Interface (manager_obj, 'org.freedesktop.ConsoleKit.Manager') + +params = dbus.Array ([], signature = "sv") +params.append (("user", dbus.Variant (730))) +params.append (("session-type", dbus.Variant ("gnome-session"))) +params.append (("x11-display", dbus.Variant (":0.0"))) +params.append (("display-device", dbus.Variant ("/dev/tty8"))) + +cookie = manager.OpenSessionWithParameters (params) +os.environ['XDG_SESSION_COOKIE'] = cookie +print "Got cookie: %s" % cookie + +seats = manager.GetSeats () +for sid in seats: + seat_obj = bus.get_object ('org.freedesktop.ConsoleKit', sid) + seat = dbus.Interface (seat_obj, 'org.freedesktop.ConsoleKit.Seat') + sessions = seat.GetSessions () + for ssid in sessions: + session_obj = bus.get_object ('org.freedesktop.ConsoleKit', ssid) + session = dbus.Interface (session_obj, 'org.freedesktop.ConsoleKit.Session') + uid = session.GetUser () + +current_session = manager.GetCurrentSession () +print "Current session: %s" % current_session + +session_obj = bus.get_object ('org.freedesktop.ConsoleKit', ssid) +session = dbus.Interface (session_obj, 'org.freedesktop.ConsoleKit.Session') + +mainloop = gobject.MainLoop () + +gobject.timeout_add (30000, mainloop.quit) + +mainloop.run() diff --git a/src/test-session b/src/test-session deleted file mode 100755 index 72f1ade..0000000 --- a/src/test-session +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python -# -# Test opening a new session -# - -import os -import gobject -import dbus -import dbus.glib - -bus = dbus.SystemBus () - -manager_obj = bus.get_object ('org.freedesktop.ConsoleKit', '/org/freedesktop/ConsoleKit/Manager') - -manager = dbus.Interface (manager_obj, 'org.freedesktop.ConsoleKit.Manager') - -params = dbus.Array ([], signature = "sv") -params.append (("user", dbus.Variant (730))) -params.append (("session-type", dbus.Variant ("gnome-session"))) -params.append (("x11-display", dbus.Variant (":0.0"))) -params.append (("display-device", dbus.Variant ("/dev/tty8"))) - -cookie = manager.OpenSessionWithParameters (params) -os.environ['XDG_SESSION_COOKIE'] = cookie -print "Got cookie: %s" % cookie - -seats = manager.GetSeats () -for sid in seats: - seat_obj = bus.get_object ('org.freedesktop.ConsoleKit', sid) - seat = dbus.Interface (seat_obj, 'org.freedesktop.ConsoleKit.Seat') - sessions = seat.GetSessions () - for ssid in sessions: - session_obj = bus.get_object ('org.freedesktop.ConsoleKit', ssid) - session = dbus.Interface (session_obj, 'org.freedesktop.ConsoleKit.Session') - uid = session.GetUser () - -current_session = manager.GetCurrentSession () -print "Current session: %s" % current_session - -session_obj = bus.get_object ('org.freedesktop.ConsoleKit', ssid) -session = dbus.Interface (session_obj, 'org.freedesktop.ConsoleKit.Session') - -mainloop = gobject.MainLoop () - -gobject.timeout_add (30000, mainloop.quit) - -mainloop.run() -- cgit