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

[Robert Ancell]

Enable tests in packaging

[PS Jenkins bot (ps-jenkins)]

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)

[lp:~robert-ancell/lightdm/enable-tests]

1756. By Robert Ancell on 2013-08-21

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

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)

[lp:~robert-ancell/lightdm/enable-tests]

1757. By Robert Ancell on 2013-08-26

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

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)

[lp:~robert-ancell/lightdm/enable-tests]

1758. By Robert Ancell on 2013-08-26

Build-depend on python-gi

[PS Jenkins bot (ps-jenkins)]

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)

[lp:~robert-ancell/lightdm/enable-tests]

1759. By Robert Ancell on 2013-09-20

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1759
http://jenkins.qa.ubuntu.com/job/lightdm-ci/196/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/113/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-armhf-ci/1/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1760. By Robert Ancell on 2013-10-09

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1760
http://jenkins.qa.ubuntu.com/job/lightdm-ci/204/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-armhf-ci/9/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/lightdm-ci/204/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1761. By Robert Ancell on 2013-10-30

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1761
http://jenkins.qa.ubuntu.com/job/lightdm-ci/213/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/7/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/lightdm-ci/213/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1762. By Robert Ancell on 2014-02-25

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1762
http://jenkins.qa.ubuntu.com/job/lightdm-ci/246/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/40/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

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)]

FAILED: Continuous integration, rev:1765
http://jenkins.qa.ubuntu.com/job/lightdm-ci/248/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/42/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1766. By Robert Ancell on 2014-03-18

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1766
http://jenkins.qa.ubuntu.com/job/lightdm-ci/261/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/55/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1767. By Robert Ancell on 2014-08-21

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1767
http://jenkins.qa.ubuntu.com/job/lightdm-ci/305/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/18/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1768. By Robert Ancell on 2014-10-02

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1768
http://jenkins.qa.ubuntu.com/job/lightdm-ci/307/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/20/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1769. By Robert Ancell on 2014-11-11

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1769
http://jenkins.qa.ubuntu.com/job/lightdm-ci/308/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-vivid-armhf-ci/1/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1770. By Robert Ancell on 2014-11-12

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1770
http://jenkins.qa.ubuntu.com/job/lightdm-ci/309/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-vivid-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-vivid-armhf-ci/2/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1771. By Robert Ancell on 2014-11-12

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1771
http://jenkins.qa.ubuntu.com/job/lightdm-ci/310/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-vivid-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-vivid-armhf-ci/3/console

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

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/enable-tests]

1772. By Robert Ancell on 2015-08-09

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1772
http://jenkins.qa.ubuntu.com/job/lightdm-ci/311/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-wily-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-wily-armhf-ci/1/console

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

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

=== 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 @@
                gtk-doc-tools,
                yelp-tools,
                dbus,
+               python-gi,
 Homepage: https://launchpad.net/lightdm
 # If you aren't a member of ~lightdm-team but need to upload packaging changes,
 # just go ahead.  ~lightdm-team will notice and sync up the code again.

=== 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 @@
 	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
 
 override_dh_auto_test:
-	#Disabled for now, are failing for some reason
-	#DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
+	DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
 
 override_dh_install:
 	rm -r debian/tmp/usr/share/help/C/

=== 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 @@
     address = g_network_address_new (client->priv->host, client->priv->port);
     enumerator = g_socket_connectable_enumerate (address);
     result = FALSE;
-    while (TRUE)
+    while (!result)
     {
         GSocketAddress *socket_address;
-        GError *e = NULL;
 
-        socket_address = g_socket_address_enumerator_next (enumerator, NULL, &e);
-        if (e)
-            g_warning ("Failed to get socket address: %s", e->message);
-        g_clear_error (&e);
+        socket_address = g_socket_address_enumerator_next (enumerator, NULL, &error);
+        if (error)
+            g_warning ("Failed to get socket address: %s", error->message);
+        g_clear_error (&error);
         if (!socket_address)
             break;
 
-        result = g_socket_connect (client->priv->socket, socket_address, NULL, error ? NULL : &error);
+        result = g_socket_connect (client->priv->socket, socket_address, NULL, &error);
+        if (error)
+            g_warning ("Failed to connect to XDMCP socket: %s", error->message);
+        g_clear_error (&error);
+
         g_object_unref (socket_address);
-        if (result)
-        {
-            g_clear_error (&error);
-            break;
-        }
     }
-    if (error)
-        g_warning ("Unable to connect XDMCP socket: %s", error->message);
     if (!result)
         return FALSE;