Commit daa24fa2 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[1207] some trivial editorial changes

parent 5da5594d
......@@ -1261,15 +1261,14 @@ public:
isc::datasrc::ZoneUpdaterPtr
getUpdater(const isc::dns::Name&, bool, bool) const {
isc_throw(isc::NotImplemented, "Update attempt on in fake data source");
isc_throw(isc::NotImplemented,
"Update attempt on in fake data source");
}
std::pair<isc::datasrc::ZoneJournalReader::Result,
isc::datasrc::ZoneJournalReaderPtr>
getJournalReader(const isc::dns::Name&, uint32_t,
uint32_t) const
{
getJournalReader(const isc::dns::Name&, uint32_t, uint32_t) const {
isc_throw(isc::NotImplemented, "Journaling isn't supported for "
"in memory data source");
"fake data source");
}
private:
const isc::datasrc::DataSourceClientContainerPtr real_client_ptr_;
......@@ -1294,7 +1293,8 @@ public:
ConstRRsetPtr fake_rrset = ConstRRsetPtr()) :
DataSourceClientContainer("memory",
Element::fromJSON("{\"type\": \"memory\"}")),
client_(new FakeClient(real_client, throw_when, isc_exception, fake_rrset))
client_(new FakeClient(real_client, throw_when, isc_exception,
fake_rrset))
{}
isc::datasrc::DataSourceClient& getInstance() {
......
......@@ -326,7 +326,8 @@ TEST_F(AuthCommandTest,
// Now send the command to reload it
result_ = execAuthServerCommand(server_, "loadzone",
Element::fromJSON("{\"origin\": \"example.org\"}"));
Element::fromJSON(
"{\"origin\": \"example.org\"}"));
checkAnswer(0);
// And now it should be present too.
......@@ -345,7 +346,8 @@ TEST_F(AuthCommandTest,
module_session.setLocalConfig(Element::fromJSON("{\"datasources\": []}"));
result_ = execAuthServerCommand(server_, "loadzone",
Element::fromJSON("{\"origin\": \"example.org\"}"));
Element::fromJSON(
"{\"origin\": \"example.org\"}"));
checkAnswer(1);
// The previous zone is not hurt in any way
......
......@@ -178,7 +178,6 @@ applyConfig(isc::datasrc::InMemoryClient& client,
return;
}
BOOST_FOREACH(ConstElementPtr zone_config, zones_config->listValue()) {
ConstElementPtr origin = zone_config->get("origin");
const std::string origin_txt = origin ? origin->stringValue() : "";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment