summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-01-25 09:06:57 +0100
committerBastien Nocera <hadess@hadess.net>2013-01-25 09:06:57 +0100
commit1895ddf473ec260c3b87012adaa91903bb70c227 (patch)
treeb9a815e9cf4df742e7da913ed23d6b6dd47642ea /tests
parent3c186ed87640f39b942a512013e6497c7245f85f (diff)
downloadgnome-settings-daemon-1895ddf473ec260c3b87012adaa91903bb70c227.tar.gz
tests: Create a new gnome-session for each test
Instead of re-using our current one. This will allow us testing cases where the session needs to exit.
Diffstat (limited to 'tests')
-rw-r--r--tests/gsdtestcase.py32
1 files changed, 0 insertions, 32 deletions
diff --git a/tests/gsdtestcase.py b/tests/gsdtestcase.py
index 09478056..df2159de 100644
--- a/tests/gsdtestcase.py
+++ b/tests/gsdtestcase.py
@@ -89,7 +89,6 @@ class GSDTestCase(dbusmock.DBusTestCase):
klass.p_notify.terminate()
klass.p_notify.wait()
klass.stop_monitor()
- klass.stop_session()
dbusmock.DBusTestCase.tearDownClass()
klass.stop_xorg()
shutil.rmtree(klass.workdir)
@@ -128,37 +127,6 @@ class GSDTestCase(dbusmock.DBusTestCase):
os.makedirs(d)
shutil.copy(os.path.join(os.path.dirname(__file__), 'dummyapp.desktop'), d)
- klass.session_log = open(os.path.join(klass.workdir, 'gnome-session.log'), 'wb')
- klass.session = subprocess.Popen(['gnome-session', '-f',
- '-a', os.path.join(klass.workdir, 'autostart'),
- '--session=dummy', '--debug'],
- stdout=klass.session_log,
- stderr=subprocess.STDOUT)
-
- # wait until the daemon is on the bus
- try:
- klass.wait_for_bus_object('org.gnome.SessionManager',
- '/org/gnome/SessionManager')
- except:
- # on failure, print log
- with open(klass.session_log.name) as f:
- print('----- session log -----\n%s\n------' % f.read())
- raise
-
- klass.obj_session_mgr = klass.session_bus_con.get_object(
- 'org.gnome.SessionManager', '/org/gnome/SessionManager')
-
- @classmethod
- def stop_session(klass):
- '''Stop GNOME session'''
-
- assert klass.session
- klass.session.terminate()
- klass.session.wait()
-
- klass.session_log.flush()
- klass.session_log.close()
-
@classmethod
def start_monitor(klass):
'''Start dbus-monitor'''