Merge lp:~robert-ancell/lightdm/enable-tests into lp:lightdm

Proposed by Robert Ancell on 2013-08-21
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
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

Commit message

Enable tests in packaging

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1755
http://jenkins.qa.ubuntu.com/job/lightdm-ci/176/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/93/console

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

review: Needs Fixing (continuous-integration)
1756. By Robert Ancell on 2013-08-21

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1756
http://jenkins.qa.ubuntu.com/job/lightdm-ci/177/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/94/console

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

review: Needs Fixing (continuous-integration)
1757. By Robert Ancell on 2013-08-26

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1757
http://jenkins.qa.ubuntu.com/job/lightdm-ci/189/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/106/console

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

review: Needs Fixing (continuous-integration)
1758. By Robert Ancell on 2013-08-26

Build-depend on python-gi

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1758
http://jenkins.qa.ubuntu.com/job/lightdm-ci/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/107/console

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

review: Needs Fixing (continuous-integration)
1759. By Robert Ancell on 2013-09-20

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1760. By Robert Ancell on 2013-10-09

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1761. By Robert Ancell on 2013-10-30

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1762. By Robert Ancell on 2014-02-25

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1763. By Robert Ancell on 2014-02-27

Merge with trunk

1764. By Robert Ancell on 2014-02-27

Tidy up test VNC/XDMCP client connection logic - it might be causing the server to fail

1765. By Robert Ancell on 2014-02-27

Add additional overrides so it looks like systemd is running

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1766. By Robert Ancell on 2014-03-18

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1767. By Robert Ancell on 2014-08-21

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1768. By Robert Ancell on 2014-10-02

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1769. By Robert Ancell on 2014-11-11

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1770. By Robert Ancell on 2014-11-12

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1771. By Robert Ancell on 2014-11-12

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1772. By Robert Ancell on 2015-08-09

Merge with trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

1772. By Robert Ancell on 2015-08-09

Merge with trunk

1771. By Robert Ancell on 2014-11-12

Merge with trunk

1770. By Robert Ancell on 2014-11-12

Merge with trunk

1769. By Robert Ancell on 2014-11-11

Merge with trunk

1768. By Robert Ancell on 2014-10-02

Merge with trunk

1767. By Robert Ancell on 2014-08-21

Merge with trunk

1766. By Robert Ancell on 2014-03-18

Merge with trunk

1765. By Robert Ancell on 2014-02-27

Add additional overrides so it looks like systemd is running

1764. By Robert Ancell on 2014-02-27

Tidy up test VNC/XDMCP client connection logic - it might be causing the server to fail

1763. By Robert Ancell on 2014-02-27

Merge with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2015-08-07 01:01:36 +0000
+++ debian/control 2015-08-09 23:21:59 +0000
@@ -25,6 +25,7 @@
25 gtk-doc-tools,25 gtk-doc-tools,
26 yelp-tools,26 yelp-tools,
27 dbus,27 dbus,
28 python-gi,
28Homepage: https://launchpad.net/lightdm29Homepage: https://launchpad.net/lightdm
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,
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.
3132
=== modified file 'debian/rules'
--- debian/rules 2014-07-25 22:12:59 +0000
+++ debian/rules 2015-08-09 23:21:59 +0000
@@ -14,8 +14,7 @@
14 dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc14 dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
1515
16override_dh_auto_test:16override_dh_auto_test:
17 #Disabled for now, are failing for some reason17 DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
18 #DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
1918
20override_dh_install:19override_dh_install:
21 rm -r debian/tmp/usr/share/help/C/20 rm -r debian/tmp/usr/share/help/C/
2221
=== modified file 'tests/src/xdmcp-client.c'
--- tests/src/xdmcp-client.c 2014-11-12 00:26:36 +0000
+++ tests/src/xdmcp-client.c 2015-08-09 23:21:59 +0000
@@ -276,28 +276,24 @@
276 address = g_network_address_new (client->priv->host, client->priv->port);276 address = g_network_address_new (client->priv->host, client->priv->port);
277 enumerator = g_socket_connectable_enumerate (address);277 enumerator = g_socket_connectable_enumerate (address);
278 result = FALSE;278 result = FALSE;
279 while (TRUE)279 while (!result)
280 {280 {
281 GSocketAddress *socket_address;281 GSocketAddress *socket_address;
282 GError *e = NULL;
283282
284 socket_address = g_socket_address_enumerator_next (enumerator, NULL, &e);283 socket_address = g_socket_address_enumerator_next (enumerator, NULL, &error);
285 if (e)284 if (error)
286 g_warning ("Failed to get socket address: %s", e->message);285 g_warning ("Failed to get socket address: %s", error->message);
287 g_clear_error (&e);286 g_clear_error (&error);
288 if (!socket_address)287 if (!socket_address)
289 break;288 break;
290289
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);
291 if (error)
292 g_warning ("Failed to connect to XDMCP socket: %s", error->message);
293 g_clear_error (&error);
294
292 g_object_unref (socket_address);295 g_object_unref (socket_address);
293 if (result)
294 {
295 g_clear_error (&error);
296 break;
297 }
298 }296 }
299 if (error)
300 g_warning ("Unable to connect XDMCP socket: %s", error->message);
301 if (!result)297 if (!result)
302 return FALSE;298 return FALSE;
303299

Subscribers

People subscribed via source and target branches