From c25985bfb375f7c513bcccb23c73ea35b910e6a4 Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Mon, 19 Oct 2020 16:48:13 +0300 Subject: [PATCH] [#1298] missing spaces in error messages in tests --- src/bin/d2/tests/d2_cfg_mgr_unittests.cc | 2 +- src/bin/d2/tests/d2_process_unittests.cc | 2 +- src/bin/d2/tests/testdata/d2_cfg_tests.json | 14 +++++++------- src/lib/cql/testutils/cql_schema.cc | 4 ++-- .../tests/pgsql_host_data_source_unittest.cc | 2 +- src/lib/mysql/testutils/mysql_schema.cc | 4 ++-- src/lib/pgsql/testutils/pgsql_schema.cc | 4 ++-- src/lib/process/testutils/d_test_stubs.cc | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc index 876a879586..a2c901234e 100644 --- a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc +++ b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc @@ -418,7 +418,7 @@ TEST_F(D2CfgMgrTest, invalidEntry) { // Unsupported protocol config = makeParamsConfigString ("127.0.0.1", 777, 333, "TCP", "JSON"); LOGIC_ERROR(config, "ncr-protocol : TCP is not yet supported" - " (:1:92)"); + " (:1:92)"); // Invalid format config = makeParamsConfigString ("127.0.0.1", 777, 333, "UDP", "BOGUS"); diff --git a/src/bin/d2/tests/d2_process_unittests.cc b/src/bin/d2/tests/d2_process_unittests.cc index 73936e5bb0..2af2b3021d 100644 --- a/src/bin/d2/tests/d2_process_unittests.cc +++ b/src/bin/d2/tests/d2_process_unittests.cc @@ -101,7 +101,7 @@ public: if (rcode) { return (::testing::AssertionFailure(::testing::Message() << - "configure() failed:" + "configure() failed: " << comment)); } diff --git a/src/bin/d2/tests/testdata/d2_cfg_tests.json b/src/bin/d2/tests/testdata/d2_cfg_tests.json index c90a788eb9..f836d996bd 100644 --- a/src/bin/d2/tests/testdata/d2_cfg_tests.json +++ b/src/bin/d2/tests/testdata/d2_cfg_tests.json @@ -240,7 +240,7 @@ #----- ,{ "description" : "D2Params.ncr-protocol, unsupported TCP", -"logic-error" : "ncr-protocol : TCP is not yet supported (:1:41)", +"logic-error" : "ncr-protocol : TCP is not yet supported (:1:41)", "data" : { "ncr-protocol" : "TCP", @@ -545,7 +545,7 @@ #----- ,{ "description" : "D2.tsig-keys, too small truncated HMAC-MD5", -"logic-error" : "tsig-key: digest-bits too small : (:1:104)", +"logic-error" : "tsig-key: digest-bits too small : (:1:104)", "data" : { "forward-ddns" : {}, @@ -565,7 +565,7 @@ #----- ,{ "description" : "D2.tsig-keys, too small truncated HMAC-SHA1", -"logic-error" : "tsig-key: digest-bits too small : (:1:105)", +"logic-error" : "tsig-key: digest-bits too small : (:1:105)", "data" : { "forward-ddns" : {}, @@ -585,7 +585,7 @@ #----- ,{ "description" : "D2.tsig-keys, too small truncated HMAC-SHA224", -"logic-error" : "tsig-key: digest-bits too small : (:1:107)", +"logic-error" : "tsig-key: digest-bits too small : (:1:107)", "data" : { "forward-ddns" : {}, @@ -605,7 +605,7 @@ #----- ,{ "description" : "D2.tsig-keys, too small truncated HMAC-SHA256", -"logic-error" : "tsig-key: digest-bits too small : (:1:107)", +"logic-error" : "tsig-key: digest-bits too small : (:1:107)", "data" : { "forward-ddns" : {}, @@ -625,7 +625,7 @@ #----- ,{ "description" : "D2.tsig-keys, too small truncated HMAC-SHA384", -"logic-error" : "tsig-key: digest-bits too small : (:1:107)", +"logic-error" : "tsig-key: digest-bits too small : (:1:107)", "data" : { "forward-ddns" : {}, @@ -645,7 +645,7 @@ #----- ,{ "description" : "D2.tsig-keys, too small truncated HMAC-SHA512", -"logic-error" : "tsig-key: digest-bits too small : (:1:107)", +"logic-error" : "tsig-key: digest-bits too small : (:1:107)", "data" : { "forward-ddns" : {}, diff --git a/src/lib/cql/testutils/cql_schema.cc b/src/lib/cql/testutils/cql_schema.cc index 4dff591c5a..f4b3b13765 100644 --- a/src/lib/cql/testutils/cql_schema.cc +++ b/src/lib/cql/testutils/cql_schema.cc @@ -68,8 +68,8 @@ runCqlScript(const std::string& path, int32_t retval = ::system(cmd.str().c_str()); if (retval) { - std::cerr << "runCqlSchema failed:" << cmd.str() << std::endl; - isc_throw(Unexpected, "runCqlSchema failed:" << cmd.str()); + std::cerr << "runCqlSchema failed: " << cmd.str() << std::endl; + isc_throw(Unexpected, "runCqlSchema failed: " << cmd.str()); } } diff --git a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc index a33a2434af..3ca49bc04c 100644 --- a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc @@ -128,7 +128,7 @@ public: PgSqlResult r(PQexec(conn, query.c_str())); if (PQresultStatus(r) != PGRES_TUPLES_OK) { - isc_throw(DbOperationError, "Query failed:" << PQerrorMessage(conn)); + isc_throw(DbOperationError, "Query failed: " << PQerrorMessage(conn)); } int numrows = PQntuples(r); diff --git a/src/lib/mysql/testutils/mysql_schema.cc b/src/lib/mysql/testutils/mysql_schema.cc index ef72313abc..d198bbde0e 100644 --- a/src/lib/mysql/testutils/mysql_schema.cc +++ b/src/lib/mysql/testutils/mysql_schema.cc @@ -82,8 +82,8 @@ void runMySQLScript(const std::string& path, const std::string& script_name, int retval = ::system(cmd.str().c_str()); if (retval) { - std::cerr << "runMySQLSchema failed:" << cmd.str() << std::endl; - isc_throw(Unexpected, "runMySQLSchema failed:" << cmd.str()); + std::cerr << "runMySQLSchema failed: " << cmd.str() << std::endl; + isc_throw(Unexpected, "runMySQLSchema failed: " << cmd.str()); } } diff --git a/src/lib/pgsql/testutils/pgsql_schema.cc b/src/lib/pgsql/testutils/pgsql_schema.cc index f12bcbfef7..049fadffef 100644 --- a/src/lib/pgsql/testutils/pgsql_schema.cc +++ b/src/lib/pgsql/testutils/pgsql_schema.cc @@ -93,8 +93,8 @@ void runPgSQLScript(const std::string& path, const std::string& script_name, int retval = ::system(cmd.str().c_str()); if (retval) { - std::cerr << "runPgSQLSchema failed:" << cmd.str() << std::endl; - isc_throw(Unexpected, "runPgSQLSchema failed:" << cmd.str()); + std::cerr << "runPgSQLSchema failed: " << cmd.str() << std::endl; + isc_throw(Unexpected, "runPgSQLSchema failed: " << cmd.str()); } } diff --git a/src/lib/process/testutils/d_test_stubs.cc b/src/lib/process/testutils/d_test_stubs.cc index 300035e24f..730ac53677 100644 --- a/src/lib/process/testutils/d_test_stubs.cc +++ b/src/lib/process/testutils/d_test_stubs.cc @@ -47,7 +47,7 @@ DStubProcess::run() { io_service->run_one(); } catch (const std::exception& ex) { isc_throw (DProcessBaseError, - std::string("Process run method failed:") + ex.what()); + std::string("Process run method failed: ") + ex.what()); } } }; -- GitLab