Verified Commit c25985bf authored by Andrei Pavel's avatar Andrei Pavel 🐧

[#1298] missing spaces in error messages in tests

parent 9abbf8e9
...@@ -418,7 +418,7 @@ TEST_F(D2CfgMgrTest, invalidEntry) { ...@@ -418,7 +418,7 @@ TEST_F(D2CfgMgrTest, invalidEntry) {
// Unsupported protocol // Unsupported protocol
config = makeParamsConfigString ("127.0.0.1", 777, 333, "TCP", "JSON"); config = makeParamsConfigString ("127.0.0.1", 777, 333, "TCP", "JSON");
LOGIC_ERROR(config, "ncr-protocol : TCP is not yet supported" LOGIC_ERROR(config, "ncr-protocol : TCP is not yet supported"
" (<string>:1:92)"); " (<string>:1:92)");
// Invalid format // Invalid format
config = makeParamsConfigString ("127.0.0.1", 777, 333, "UDP", "BOGUS"); config = makeParamsConfigString ("127.0.0.1", 777, 333, "UDP", "BOGUS");
......
...@@ -101,7 +101,7 @@ public: ...@@ -101,7 +101,7 @@ public:
if (rcode) { if (rcode) {
return (::testing::AssertionFailure(::testing::Message() << return (::testing::AssertionFailure(::testing::Message() <<
"configure() failed:" "configure() failed: "
<< comment)); << comment));
} }
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
#----- #-----
,{ ,{
"description" : "D2Params.ncr-protocol, unsupported TCP", "description" : "D2Params.ncr-protocol, unsupported TCP",
"logic-error" : "ncr-protocol : TCP is not yet supported (<string>:1:41)", "logic-error" : "ncr-protocol : TCP is not yet supported (<string>:1:41)",
"data" : "data" :
{ {
"ncr-protocol" : "TCP", "ncr-protocol" : "TCP",
...@@ -545,7 +545,7 @@ ...@@ -545,7 +545,7 @@
#----- #-----
,{ ,{
"description" : "D2.tsig-keys, too small truncated HMAC-MD5", "description" : "D2.tsig-keys, too small truncated HMAC-MD5",
"logic-error" : "tsig-key: digest-bits too small : (<string>:1:104)", "logic-error" : "tsig-key: digest-bits too small : (<string>:1:104)",
"data" : "data" :
{ {
"forward-ddns" : {}, "forward-ddns" : {},
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
#----- #-----
,{ ,{
"description" : "D2.tsig-keys, too small truncated HMAC-SHA1", "description" : "D2.tsig-keys, too small truncated HMAC-SHA1",
"logic-error" : "tsig-key: digest-bits too small : (<string>:1:105)", "logic-error" : "tsig-key: digest-bits too small : (<string>:1:105)",
"data" : "data" :
{ {
"forward-ddns" : {}, "forward-ddns" : {},
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
#----- #-----
,{ ,{
"description" : "D2.tsig-keys, too small truncated HMAC-SHA224", "description" : "D2.tsig-keys, too small truncated HMAC-SHA224",
"logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)", "logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)",
"data" : "data" :
{ {
"forward-ddns" : {}, "forward-ddns" : {},
...@@ -605,7 +605,7 @@ ...@@ -605,7 +605,7 @@
#----- #-----
,{ ,{
"description" : "D2.tsig-keys, too small truncated HMAC-SHA256", "description" : "D2.tsig-keys, too small truncated HMAC-SHA256",
"logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)", "logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)",
"data" : "data" :
{ {
"forward-ddns" : {}, "forward-ddns" : {},
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
#----- #-----
,{ ,{
"description" : "D2.tsig-keys, too small truncated HMAC-SHA384", "description" : "D2.tsig-keys, too small truncated HMAC-SHA384",
"logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)", "logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)",
"data" : "data" :
{ {
"forward-ddns" : {}, "forward-ddns" : {},
...@@ -645,7 +645,7 @@ ...@@ -645,7 +645,7 @@
#----- #-----
,{ ,{
"description" : "D2.tsig-keys, too small truncated HMAC-SHA512", "description" : "D2.tsig-keys, too small truncated HMAC-SHA512",
"logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)", "logic-error" : "tsig-key: digest-bits too small : (<string>:1:107)",
"data" : "data" :
{ {
"forward-ddns" : {}, "forward-ddns" : {},
......
...@@ -68,8 +68,8 @@ runCqlScript(const std::string& path, ...@@ -68,8 +68,8 @@ runCqlScript(const std::string& path,
int32_t retval = ::system(cmd.str().c_str()); int32_t retval = ::system(cmd.str().c_str());
if (retval) { if (retval) {
std::cerr << "runCqlSchema failed:" << cmd.str() << std::endl; std::cerr << "runCqlSchema failed: " << cmd.str() << std::endl;
isc_throw(Unexpected, "runCqlSchema failed:" << cmd.str()); isc_throw(Unexpected, "runCqlSchema failed: " << cmd.str());
} }
} }
......
...@@ -128,7 +128,7 @@ public: ...@@ -128,7 +128,7 @@ public:
PgSqlResult r(PQexec(conn, query.c_str())); PgSqlResult r(PQexec(conn, query.c_str()));
if (PQresultStatus(r) != PGRES_TUPLES_OK) { if (PQresultStatus(r) != PGRES_TUPLES_OK) {
isc_throw(DbOperationError, "Query failed:" << PQerrorMessage(conn)); isc_throw(DbOperationError, "Query failed: " << PQerrorMessage(conn));
} }
int numrows = PQntuples(r); int numrows = PQntuples(r);
......
...@@ -82,8 +82,8 @@ void runMySQLScript(const std::string& path, const std::string& script_name, ...@@ -82,8 +82,8 @@ void runMySQLScript(const std::string& path, const std::string& script_name,
int retval = ::system(cmd.str().c_str()); int retval = ::system(cmd.str().c_str());
if (retval) { if (retval) {
std::cerr << "runMySQLSchema failed:" << cmd.str() << std::endl; std::cerr << "runMySQLSchema failed: " << cmd.str() << std::endl;
isc_throw(Unexpected, "runMySQLSchema failed:" << cmd.str()); isc_throw(Unexpected, "runMySQLSchema failed: " << cmd.str());
} }
} }
......
...@@ -93,8 +93,8 @@ void runPgSQLScript(const std::string& path, const std::string& script_name, ...@@ -93,8 +93,8 @@ void runPgSQLScript(const std::string& path, const std::string& script_name,
int retval = ::system(cmd.str().c_str()); int retval = ::system(cmd.str().c_str());
if (retval) { if (retval) {
std::cerr << "runPgSQLSchema failed:" << cmd.str() << std::endl; std::cerr << "runPgSQLSchema failed: " << cmd.str() << std::endl;
isc_throw(Unexpected, "runPgSQLSchema failed:" << cmd.str()); isc_throw(Unexpected, "runPgSQLSchema failed: " << cmd.str());
} }
} }
......
...@@ -47,7 +47,7 @@ DStubProcess::run() { ...@@ -47,7 +47,7 @@ DStubProcess::run() {
io_service->run_one(); io_service->run_one();
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
isc_throw (DProcessBaseError, isc_throw (DProcessBaseError,
std::string("Process run method failed:") + ex.what()); std::string("Process run method failed: ") + ex.what());
} }
} }
}; };
......
Markdown is supported
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