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
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 gtk-doc-tools,
6 yelp-tools,
7 dbus,
8+ python-gi,
9 Homepage: https://launchpad.net/lightdm
10 # If you aren't a member of ~lightdm-team but need to upload packaging changes,
11 # just go ahead. ~lightdm-team will notice and sync up the code again.
12
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 dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
18
19 override_dh_auto_test:
20- #Disabled for now, are failing for some reason
21- #DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
22+ DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
23
24 override_dh_install:
25 rm -r debian/tmp/usr/share/help/C/
26
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 address = g_network_address_new (client->priv->host, client->priv->port);
32 enumerator = g_socket_connectable_enumerate (address);
33 result = FALSE;
34- while (TRUE)
35+ while (!result)
36 {
37 GSocketAddress *socket_address;
38- GError *e = NULL;
39
40- socket_address = g_socket_address_enumerator_next (enumerator, NULL, &e);
41- if (e)
42- g_warning ("Failed to get socket address: %s", e->message);
43- g_clear_error (&e);
44+ socket_address = g_socket_address_enumerator_next (enumerator, NULL, &error);
45+ if (error)
46+ g_warning ("Failed to get socket address: %s", error->message);
47+ g_clear_error (&error);
48 if (!socket_address)
49 break;
50
51- result = g_socket_connect (client->priv->socket, socket_address, NULL, error ? NULL : &error);
52+ result = g_socket_connect (client->priv->socket, socket_address, NULL, &error);
53+ if (error)
54+ g_warning ("Failed to connect to XDMCP socket: %s", error->message);
55+ g_clear_error (&error);
56+
57 g_object_unref (socket_address);
58- if (result)
59- {
60- g_clear_error (&error);
61- break;
62- }
63 }
64- if (error)
65- g_warning ("Unable to connect XDMCP socket: %s", error->message);
66 if (!result)
67 return FALSE;
68

Subscribers

People subscribed via source and target branches