Merge lp:~robert-ancell/lightdm/test-no-usc into lp:lightdm

[Robert Ancell]

Check we correctly stop if the Unity compositor can't be found

[lp:~robert-ancell/lightdm/test-no-usc]

1919. By Robert Ancell on 2014-03-07

Fix memory leak

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1918
http://jenkins.qa.ubuntu.com/job/lightdm-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/47

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/253/rebuild

review: Approve (continuous-integration)

=== modified file 'src/unity-system-compositor.c'
--- src/unity-system-compositor.c	2014-03-04 03:23:30 +0000
+++ src/unity-system-compositor.c	2014-03-07 03:47:21 +0000
@@ -403,13 +403,19 @@
         process_set_env (compositor->priv->process, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
     }
 
-    command = g_strdup_printf ("%s --file '%s' --from-dm-fd %d --to-dm-fd %d --vt %d", compositor->priv->command, compositor->priv->socket, compositor->priv->to_compositor_pipe[0], compositor->priv->from_compositor_pipe[1], compositor->priv->vt);
-    absolute_command = get_absolute_command (command);
+    /* Generate command line to run */
+    absolute_command = get_absolute_command (compositor->priv->command);
+    if (!absolute_command)
+    {
+        l_debug (compositor, "Can't launch compositor %s, not found in path", compositor->priv->command);
+        return FALSE;
+    }
+    command = g_strdup_printf ("%s --file '%s' --from-dm-fd %d --to-dm-fd %d --vt %d", absolute_command, compositor->priv->socket, compositor->priv->to_compositor_pipe[0], compositor->priv->from_compositor_pipe[1], compositor->priv->vt);
+    process_set_command (compositor->priv->process, command);
     g_free (command);
+    g_free (absolute_command);
 
     /* Start the compositor */
-    process_set_command (compositor->priv->process, absolute_command);
-    g_free (absolute_command);
     g_signal_connect (compositor->priv->process, "stopped", G_CALLBACK (stopped_cb), compositor);
     result = process_start (compositor->priv->process, FALSE);
 

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2014-02-26 23:52:14 +0000
+++ tests/Makefile.am	2014-03-07 03:47:21 +0000
@@ -161,6 +161,7 @@
 	test-mir-session-crash \
 	test-mir-session-compositor-crash \
 	test-unity-compositor-command \
+	test-unity-compositor-not-found \
 	test-unity-compositor-fail-start \
 	test-unity-compositor-fail-ready \
 	test-unity-compositor-crash \
@@ -452,6 +453,7 @@
 	scripts/unity-compositor-fallback.conf \
 	scripts/unity-compositor-mir-next-session.conf \
 	scripts/unity-compositor-next-session.conf \
+	scripts/unity-compositor-not-found.conf \
 	scripts/unity-login.conf \
 	scripts/unity-mir-autologin.conf \
 	scripts/unity-mir-greeter-mir-session.conf \

=== added file 'tests/scripts/unity-compositor-not-found.conf'
--- tests/scripts/unity-compositor-not-found.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/unity-compositor-not-found.conf	2014-03-07 03:47:21 +0000
@@ -0,0 +1,16 @@
+#
+# Check can set the unity compositor command
+#
+
+[SeatDefaults]
+type=unity
+user-session=default
+unity-compositor-command=unity-system-compositor-INVALID
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# Command is not found
+
+# Daemon exits with error code
+#?RUNNER DAEMON-EXIT STATUS=1

=== added file 'tests/test-unity-compositor-not-found'
--- tests/test-unity-compositor-not-found	1970-01-01 00:00:00 +0000
+++ tests/test-unity-compositor-not-found	2014-03-07 03:47:21 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-compositor-not-found test-gobject-greeter