1
=== modified file 'debian/control'
2
--- debian/control	2015-08-07 01:01:36 +0000
3
+++ debian/control	2015-08-09 23:21:59 +0000
4
@@ -25,6 +25,7 @@
5
25
               gtk-doc-tools,
25
               gtk-doc-tools,
6
26
               yelp-tools,
26
               yelp-tools,
7
27
               dbus,
27
               dbus,
8
28
               python-gi,
9
28
Homepage: https://launchpad.net/lightdm
29
Homepage: https://launchpad.net/lightdm
10
29
# If you aren't a member of ~lightdm-team but need to upload packaging changes,
30
# If you aren't a member of ~lightdm-team but need to upload packaging changes,
11
30
# just go ahead.  ~lightdm-team will notice and sync up the code again.
31
# just go ahead.  ~lightdm-team will notice and sync up the code again.
12
31
32
13
=== modified file 'debian/rules'
14
--- debian/rules	2014-07-25 22:12:59 +0000
15
+++ debian/rules	2015-08-09 23:21:59 +0000
16
@@ -14,8 +14,7 @@
17
14
	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
14
	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
18
15
15
19
16
override_dh_auto_test:
16
override_dh_auto_test:
22
17
	#Disabled for now, are failing for some reason
17
	DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
21
18
	#DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
23
19
18
24
20
override_dh_install:
19
override_dh_install:
25
21
	rm -r debian/tmp/usr/share/help/C/
20
	rm -r debian/tmp/usr/share/help/C/
26
22
21
27
=== modified file 'tests/src/xdmcp-client.c'
28
--- tests/src/xdmcp-client.c	2014-11-12 00:26:36 +0000
29
+++ tests/src/xdmcp-client.c	2015-08-09 23:21:59 +0000
30
@@ -276,28 +276,24 @@
31
276
    address = g_network_address_new (client->priv->host, client->priv->port);
276
    address = g_network_address_new (client->priv->host, client->priv->port);
32
277
    enumerator = g_socket_connectable_enumerate (address);
277
    enumerator = g_socket_connectable_enumerate (address);
33
278
    result = FALSE;
278
    result = FALSE;
35
279
    while (TRUE)
279
    while (!result)
36
280
    {
280
    {
37
281
        GSocketAddress *socket_address;
281
        GSocketAddress *socket_address;
38
282
        GError *e = NULL;
39
283
282
44
284
        socket_address = g_socket_address_enumerator_next (enumerator, NULL, &e);
283
        socket_address = g_socket_address_enumerator_next (enumerator, NULL, &error);
45
285
        if (e)
284
        if (error)
46
286
            g_warning ("Failed to get socket address: %s", e->message);
285
            g_warning ("Failed to get socket address: %s", error->message);
47
287
        g_clear_error (&e);
286
        g_clear_error (&error);
48
288
        if (!socket_address)
287
        if (!socket_address)
49
289
            break;
288
            break;
50
290
289
52
291
        result = g_socket_connect (client->priv->socket, socket_address, NULL, error ? NULL : &error);
290
        result = g_socket_connect (client->priv->socket, socket_address, NULL, &error);
53
291
        if (error)
54
292
            g_warning ("Failed to connect to XDMCP socket: %s", error->message);
55
293
        g_clear_error (&error);
56
294
57
292
        g_object_unref (socket_address);
295
        g_object_unref (socket_address);
58
293
        if (result)
59
294
        {
60
295
            g_clear_error (&error);
61
296
            break;
62
297
        }
63
298
    }
296
    }
64
299
    if (error)
65
300
        g_warning ("Unable to connect XDMCP socket: %s", error->message);
66
301
    if (!result)
297
    if (!result)
67
302
        return FALSE;
298
        return FALSE;
68
303
299
Status:	Needs review
Proposed branch:	lp:~robert-ancell/lightdm/enable-tests
Merge into:	lp:lightdm
Diff against target:	67 lines (+12/-16) 3 files modified debian/control (+1/-0) debian/rules (+1/-2) tests/src/xdmcp-client.c (+10/-14)
To merge this branch:	bzr merge lp:~robert-ancell/lightdm/enable-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-08-09
LightDM Development Team		2013-08-21	Pending
Review via email: mp+181427@code.launchpad.net