Update unittest expectations for Android
We're using different user/group and file path on Android, so update
these expectations in unittest for Android.
While there, rename apmanager_unittest to apmanager_test, which seems
to be the convention for unittest target name on Android.
Bug: 24707201
TEST=Run unittest on dragonboard
TEST=Run unittest for Chrome OS
Change-Id: Ibd6880a713117578b68c814edc7e1cefe9170c75
diff --git a/dhcp_server.cc b/dhcp_server.cc
index 5531f0d..ab7b634 100644
--- a/dhcp_server.cc
+++ b/dhcp_server.cc
@@ -138,12 +138,12 @@
// terminated. Configure dnsmasq to run in "foreground" so no extra process
// will be spawned.
config += "keep-in-foreground\n";
- // Explicitly set the user to apmanager. If not set, dnsmasq will default to
- // run as "nobody".
- base::StringAppendF(&config, "user=%s\n", Daemon::kAPManagerUserName);
base::StringAppendF(
&config, "dhcp-range=%s,%s\n", address_low.c_str(), address_high.c_str());
base::StringAppendF(&config, "interface=%s\n", interface_name_.c_str());
+ // Explicitly set the user to apmanager. If not set, dnsmasq will default to
+ // run as "nobody".
+ base::StringAppendF(&config, "user=%s\n", Daemon::kAPManagerUserName);
base::StringAppendF(&config, "dhcp-leasefile=%s\n", lease_file_path.c_str());
return config;
}