Merge lp:~dbarth/unity-greeter/remote-login-only into lp:unity-greeter

[David Barth]

Let the greeter display only the remote login entry, without adding a fallback manual login option.

Let the greeter display only the remote login entry, without adding a fallback manual login option.

See the unit tests for the configuration details, ie:
greeter-show-manual-login=false
greeter-hide-users=true
greeter-allow-guest=false
greeter-show-remote-login=true

Note that if the remote login service becomes unavailable, the manual login entry will re-appear, and vice-versa.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:927
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-amd64-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dbarth/unity-greeter/remote-login-only]

928. By David Barth on 2013-08-01

fix the test for gdk3 on saucy

929. By David Barth on 2013-08-01

indention fixes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-ci/3/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

19 + else if (index < entries.length ())
20 + index++;

Why the change from selecting previous index to selecting next index after removing an entry?

162 +

This whitespace change in tests/test-list.vala can be dropped.

197 + /* don't go too fast, otherwise the lastest gdk3 will lose control... */
198 + Posix.sleep(1);

Ick. Did you try a call to process_events()? That might have the same effect, without an actual sleep.

211 + GLib.assert (list.num_entries() == 1);
212 + GLib.assert (list.selected_entry.id == "*remote_directory*http://crazyurl.com");

These lines (among others) seem differently indented than the surrounding area.

Besides those, seems fine and appropriate. Thanks!

review: Needs Fixing

[David Barth (dbarth)]

Le 02/08/2013 20:50, Michael Terry a écrit :
> Review: Needs Fixing
>
> 19 + else if (index < entries.length ())
> 20 + index++;
>
> Why the change from selecting previous index to selecting next index after removing an entry?
The comment explains it: we switch to either the previous line (by
default) if there exists a previous line, or if not, we change to the
next one. The code now works in cases where the line we remove is the
first line in the list, not just the last one as has been the case so far.

>
> 162 +
>
> This whitespace change in tests/test-list.vala can be dropped.
ok
>
> 197 + /* don't go too fast, otherwise the lastest gdk3 will lose control... */
> 198 + Posix.sleep(1);
>
> Ick. Did you try a call to process_events()? That might have the same effect, without an actual sleep.
I did, but gtk3/vala on saucy can get satisfied with just that :/
gtk3/vala on raring is fine without it... Otherwise, you get gtk3 to
complain about losing the last reference to an undeleted widget. I
assume this is a temporary regression in saucy.

> 211 + GLib.assert (list.num_entries() == 1);
> 212 + GLib.assert (list.selected_entry.id == "*remote_directory*http://crazyurl.com");
>
> These lines (among others) seem differently indented than the surrounding area.
I re-tabbed all of the lines I could see, hopefully for good now.

David

[Michael Terry (mterry)]

Sure, seems fine. Thanks!

review: Approve

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2013-07-08 11:35:39 +0000
+++ src/greeter-list.vala	2013-08-01 15:02:04 +0000
@@ -444,18 +444,22 @@
         entry.destroy ();
         entries.remove (entry);
 
-        /* Show a manual login if no users */
-        if (!have_entries ())
-            add_manual_entry ();
-
-        /* Select previous entry if the selected one was removed */
+       /* Select another entry if the selected one was removed */
         if (entry == selected_entry)
         {
             if (index >= entries.length () && index > 0)
                 index--;
-            select_entry (entries.nth_data (index), -1.0);
+            else if (index < entries.length ())
+                index++;
+            
+            if (entries.nth_data (index) != null)
+                select_entry (entries.nth_data (index), -1.0);
         }
 
+        /* Show a manual login if no users and no remote login entry */
+        if (!have_entries () && !UnityGreeter.singleton.show_remote_login_hint ())
+            add_manual_entry ();
+
         queue_draw ();
     }
 
 
=== modified file 'src/user-list.vala'
--- src/user-list.vala	2013-02-13 04:25:47 +0000
+++ src/user-list.vala	2013-08-01 15:02:04 +0000
@@ -124,8 +124,11 @@
 
         fill_list ();
 
-        entry_selected.connect (entry_selected_cb);
-        entry_selected_cb (selected_entry.id);
+        if (selected_entry != null)
+        {
+            entry_selected.connect (entry_selected_cb);
+            entry_selected_cb (selected_entry.id);
+        }
 
         connect_to_lightdm ();
 
@@ -150,6 +153,10 @@
     {
         remote_login_server_list = new List<RemoteServer?> ();
         remove_entries_with_prefix ("*remote_login");
+
+        /* If we have no entries at all, we should show manual */
+        if (!always_show_manual)
+            add_manual_entry ();
     }
 
     private async void query_directory_servers ()
@@ -249,6 +256,12 @@
                 it = it.next;
             }
         }
+
+        /* Remove manual option unless specified */
+        if (remote_directory_server_list.length() > 0 && !always_show_manual) {
+            debug ("removing manual login since we have a remote login entry");
+            remove_entry ("*other");
+        }
     }
 
     private PromptBox create_prompt_for_login_server (RemoteServer remote_server)
@@ -341,6 +354,12 @@
     {
         remove_remote_servers ();
         remote_login_service = null;
+
+        /* provide a fallback manual login option */
+        if (UnityGreeter.singleton.hide_users_hint ()) {
+            add_manual_entry();
+            set_active_entry ("*other");
+        }
     }
 
     private async void remote_directory_respond_cb ()
@@ -1099,31 +1118,43 @@
         {
         }
 
-        while (add_test_entry ());
-        offer_guest = true;
-        always_show_manual = true;
+        if (!UnityGreeter.singleton.hide_users_hint())
+            while (add_test_entry ());
+
+        /* add a manual entry if the list of entries is empty initially */
+        if (n_test_entries <= 0)
+        {
+            add_manual_entry();
+            set_active_entry ("*other");
+            n_test_entries++;
+        }
+
+        offer_guest = UnityGreeter.singleton.has_guest_account_hint();
+        always_show_manual = UnityGreeter.singleton.show_manual_login_hint();
 
         key_press_event.connect (test_key_press_cb);
 
-        Timeout.add (1000, () =>
-        {
-            RemoteServer[] test_server_list = {};
-            RemoteServer remote_server = RemoteServer ();
-            remote_server.type = "uccs";
-            remote_server.name = "Remote Login";
-            remote_server.url = "http://crazyurl.com";
-            remote_server.last_used_server = false;
-            remote_server.fields = {};
-            RemoteServerField field1 = RemoteServerField ();
-            field1.type = "email";
-            RemoteServerField field2 = RemoteServerField ();
-            field2.type = "password";
-            remote_server.fields = {field1, field2};
-
-            test_server_list += remote_server;
-            set_remote_directory_servers (test_server_list);
-            return false;
-        });
+        if (UnityGreeter.singleton.show_remote_login_hint())
+            Timeout.add (1000, () =>
+            {
+                RemoteServer[] test_server_list = {};
+                RemoteServer remote_server = RemoteServer ();
+                remote_server.type = "uccs";
+                remote_server.name = "Remote Login";
+                remote_server.url = "http://crazyurl.com";
+                remote_server.last_used_server = false;
+                remote_server.fields = {};
+                RemoteServerField field1 = RemoteServerField ();
+                field1.type = "email";
+                RemoteServerField field2 = RemoteServerField ();
+                field2.type = "password";
+                remote_server.fields = {field1, field2};
+                
+                test_server_list += remote_server;
+                set_remote_directory_servers (test_server_list);
+                
+                return false;
+            });
 
         var last_user = UnityGreeter.singleton.get_state ("last-user");
         if (last_user != null)
 
=== modified file 'tests/test-list.vala'
--- tests/test-list.vala	2012-09-04 13:35:33 +0000
+++ tests/test-list.vala	2013-08-01 15:02:04 +0000
@@ -15,4 +15,5 @@
     {
         return mode == Mode.SCROLLING;
     }
+
 }
 \ No newline at end of file
 
=== modified file 'tests/test.vala'
--- tests/test.vala	2013-06-20 18:17:28 +0000
+++ tests/test.vala	2013-08-01 15:02:04 +0000
@@ -145,7 +145,7 @@
         // Wait until remote login appears
         scroll_to_remote_login (list);
 
-        GLib.assert (list.num_entries() == 30);
+        GLib.assert (list.num_entries() > 0);
 
         // Make sure we are at the beginning of the list
         do_scroll (list, GreeterList.ScrollTarget.START);
@@ -688,6 +688,63 @@
         mw.hide ();
     }
 
+    public static void remote_login_only ()
+    {
+        UnityGreeter.singleton.test_mode = true;
+        UnityGreeter.singleton.session_started = false;
+
+	/* this configuration should result in the list containing only the remote login entry,
+	   without any fallback manual entry */
+        UnityGreeter.singleton._hide_users_hint = true;
+        UnityGreeter.singleton._show_remote_login_hint = true;
+        UnityGreeter.singleton._has_guest_account_hint = false;
+        UnityGreeter.singleton._show_manual_login_hint = false;
+
+        MainWindow mw = setup ();
+        TestList list = mw.stack.top () as TestList;
+
+	/* don't go too fast, otherwise the lastest gdk3 will lose control... */
+	Posix.sleep(1);
+
+	/* Wait for Remote Login to appear */
+	bool rl_appeared = false;
+	for (int i=0; i<100 && !rl_appeared; i++)
+	{
+            do_scroll (list, GreeterList.ScrollTarget.END);
+            process_events ();
+            if (list.selected_entry.id == "*remote_directory*http://crazyurl.com")
+		rl_appeared = true;
+	}
+
+	GLib.assert (rl_appeared);
+        GLib.assert (list.num_entries() == 1);
+        GLib.assert (list.selected_entry.id == "*remote_directory*http://crazyurl.com");
+
+	mw.hide ();
+   }
+
+   public static void manual_login_fallback ()
+   {
+        UnityGreeter.singleton.test_mode = true;
+        UnityGreeter.singleton.session_started = false;
+
+	/* this configuration should result in the list containing at least a manual entry */
+        UnityGreeter.singleton._hide_users_hint = true;
+        UnityGreeter.singleton._show_remote_login_hint = false;
+        UnityGreeter.singleton._has_guest_account_hint = false;
+        UnityGreeter.singleton._show_manual_login_hint = true;
+
+        MainWindow mw = setup ();
+        TestList list = mw.stack.top () as TestList;
+
+	/* verify if the manual entry has been added as a fallback mechanism */
+        GLib.assert (list.num_entries() == 1);
+        GLib.assert (list.selected_entry.id == "*other");
+
+	mw.hide ();
+   }
+
+
     static void setup_gsettings()
     {
         try
@@ -740,6 +797,8 @@
         GLib.Test.add_func ("/Email Autocomplete", email_autocomplete);
         GLib.Test.add_func ("/Greeter Communication", greeter_communcation);
         GLib.Test.add_func ("/Unsupported server type", unsupported_server_type);
+        GLib.Test.add_func ("/Remote Login Only", remote_login_only);
+        GLib.Test.add_func ("/Manual Login Fallback", manual_login_fallback);
 
         return GLib.Test.run();
     }
 
=== modified file 'tests/unity-greeter.vala'
--- tests/unity-greeter.vala	2013-02-20 16:17:42 +0000
+++ tests/unity-greeter.vala	2013-08-01 15:02:04 +0000
@@ -73,24 +73,28 @@
         return "";
     }
 
+    public bool _show_manual_login_hint = true;
     public bool show_manual_login_hint ()
     {
-        return false;
+        return _show_manual_login_hint;
     }
 
+    public bool _show_remote_login_hint = true;
     public bool show_remote_login_hint ()
     {
-        return true;
+        return _show_remote_login_hint;
     }
 
+    public bool _hide_users_hint = false;
     public bool hide_users_hint ()
     {
-        return false;
+        return _hide_users_hint;
     }
 
+    public bool _has_guest_account_hint = true;
     public bool has_guest_account_hint ()
     {
-        return false;
+        return _has_guest_account_hint;
     }
 
     public void start_session (string? session, Background bg)