commit acdc11f4961994f894f978713d1a22f2eb23687d
author Jason Glasgow <jglasgow@chromium.org> Fri Mar 30 14:12:22 2012 -0400
committer Gerrit <chrome-bot@google.com> Fri Mar 30 13:01:24 2012 -0700
tree 4c33522f87e1773b11d3925de9f5b286b66a3029
parent a31e79c0c8b66eeabd2b13c833c25380c99559ad

shill: Change service.device property to be a DBus::Path

Change service.device property to be a DBus::Path because it is a path
not a string.  Flimflam exports the property as a path.  Exporting it
as a string causes cashew to die.

Change the unit tests to use valid DBus paths which can contain
elements separated by /.  Each element can contain only
[A-z][a-z][0-9]_ and cannot end in a trailing /.

BUG=chromium-os:28734
TEST=run shill unit tests, run shill on DUT. Run cashew.

Change-Id: I65fb843fb93f76d95eea6da334ad326ccb9fbd6f
Reviewed-on: https://gerrit.chromium.org/gerrit/19366
Commit-Ready: Jason Glasgow <jglasgow@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Tested-by: Jason Glasgow <jglasgow@chromium.org>

mock_adaptors.cc

diff --git a/mock_adaptors.cc b/mock_adaptors.cc
index 86988f6..3e83ed8 100644
--- a/mock_adaptors.cc
+++ b/mock_adaptors.cc
@@ -11,9 +11,9 @@
 namespace shill {
 
 // static
-const char DeviceMockAdaptor::kRpcId[] = "/device-rpc/";
+const char DeviceMockAdaptor::kRpcId[] = "/device_rpc";
 // static
-const char DeviceMockAdaptor::kRpcConnId[] = "/device-rpc-conn/";
+const char DeviceMockAdaptor::kRpcConnId[] = "/device_rpc_conn";
 
 DeviceMockAdaptor::DeviceMockAdaptor()
     : rpc_id_(kRpcId),
@@ -29,7 +29,7 @@
 }
 
 // static
-const char IPConfigMockAdaptor::kRpcId[] = "/ipconfig-rpc/";
+const char IPConfigMockAdaptor::kRpcId[] = "/ipconfig_rpc";
 
 IPConfigMockAdaptor::IPConfigMockAdaptor() : rpc_id_(kRpcId) {}
 
@@ -38,7 +38,7 @@
 const string &IPConfigMockAdaptor::GetRpcIdentifier() { return rpc_id_; }
 
 // static
-const char ManagerMockAdaptor::kRpcId[] = "/manager-rpc/";
+const char ManagerMockAdaptor::kRpcId[] = "/manager_rpc";
 
 ManagerMockAdaptor::ManagerMockAdaptor() : rpc_id_(kRpcId) {}
 
@@ -47,7 +47,7 @@
 const string &ManagerMockAdaptor::GetRpcIdentifier() { return rpc_id_; }
 
 // static
-const char ProfileMockAdaptor::kRpcId[] = "/profile-rpc/";
+const char ProfileMockAdaptor::kRpcId[] = "/profile_rpc";
 
 ProfileMockAdaptor::ProfileMockAdaptor() : rpc_id_(kRpcId) {}
 
@@ -56,9 +56,9 @@
 const string &ProfileMockAdaptor::GetRpcIdentifier() { return rpc_id_; }
 
 // static
-const char RPCTaskMockAdaptor::kRpcId[] = "/rpc-task-rpc/";
+const char RPCTaskMockAdaptor::kRpcId[] = "/rpc_task_rpc";
 const char RPCTaskMockAdaptor::kRpcInterfaceId[] = "rpc.task";
-const char RPCTaskMockAdaptor::kRpcConnId[] = "/rpc-task-rpc-conn/";
+const char RPCTaskMockAdaptor::kRpcConnId[] = "/rpc_task_rpc_conn";
 
 RPCTaskMockAdaptor::RPCTaskMockAdaptor()
     : rpc_id_(kRpcId),
@@ -76,7 +76,7 @@
 }
 
 // static
-const char ServiceMockAdaptor::kRpcId[] = "/service-rpc/";
+const char ServiceMockAdaptor::kRpcId[] = "/service_rpc";
 
 ServiceMockAdaptor::ServiceMockAdaptor() : rpc_id_(kRpcId) {}