commit fbca6bc6d9ce8966680250b0c2c13fa67406ccb8
author Paul Stewart <pstew@chromium.org> Tue Oct 07 08:26:03 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Oct 08 02:53:17 2014 +0000
tree 7f49c2cdce4ba465b5f99938c64cb0d5f6aa963e
parent 8e1ad1684e2dd34619315c14f4b5312b93de0a83

shill: Manager: HandleProfileEntryDeletion triggers SortServices

If Manager::HandleProfileEntryDeletion causes a Service to move
between profiles or be unloaded, this should trigger a SortServices
call, which will later update the Services list and emit a property
change for the manager's "Services" property.

BUG=chromium:421082
TEST=Modified unit tests

Change-Id: I99749b7b0a0abb4d8a11b9db7d259f6821c0c191
Reviewed-on: https://chromium-review.googlesource.com/221902
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>

manager_unittest.cc

diff --git a/manager_unittest.cc b/manager_unittest.cc
index c3a4596..4d5791e 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -267,9 +267,13 @@
   }
 
   void CompleteServiceSort() {
-    EXPECT_FALSE(manager()->sort_services_task_.IsCancelled());
+    EXPECT_TRUE(IsSortServicesTaskPending());
     dispatcher()->DispatchPendingEvents();
-    EXPECT_TRUE(manager()->sort_services_task_.IsCancelled());
+    EXPECT_FALSE(IsSortServicesTaskPending());
+  }
+
+  bool IsSortServicesTaskPending() {
+    return !manager()->sort_services_task_.IsCancelled();
   }
 
   void RefreshConnectionState() {
@@ -1233,11 +1237,15 @@
   AdoptProfile(manager(), profile0);
   AdoptProfile(manager(), profile1);
 
+  CompleteServiceSort();
+
   // No services are a member of this profile.
   EXPECT_FALSE(manager()->HandleProfileEntryDeletion(profile0, entry_name));
+  EXPECT_FALSE(IsSortServicesTaskPending());
 
   // No services that are members of this profile have this entry name.
   EXPECT_FALSE(manager()->HandleProfileEntryDeletion(profile1, ""));
+  EXPECT_FALSE(IsSortServicesTaskPending());
 
   // Only services that are members of the profile and group will be abandoned.
   EXPECT_CALL(*profile1.get(),
@@ -1275,6 +1283,7 @@
   EXPECT_CALL(*s_configure_succeed.get(), Unload()).Times(0);
 
   EXPECT_TRUE(manager()->HandleProfileEntryDeletion(profile1, entry_name));
+  EXPECT_TRUE(IsSortServicesTaskPending());
 
   EXPECT_EQ(GetEphemeralProfile(manager()), s_not_in_profile->profile().get());
   EXPECT_EQ(profile1, s_not_in_group->profile());
@@ -1367,7 +1376,9 @@
 
 
   // This will cause all the profiles to be unloaded.
+  EXPECT_FALSE(IsSortServicesTaskPending());
   EXPECT_TRUE(manager()->HandleProfileEntryDeletion(profile, entry_name));
+  EXPECT_TRUE(IsSortServicesTaskPending());
 
   // 2 of the 4 services added above should have been unregistered and
   // removed, leaving 2.