r21701 - gnucash/trunk/src/backend/dbi/test - [Testing] Suppress verbose messages, expected warnings in backend/dbi checks.
John Ralls
jralls at code.gnucash.org
Fri Dec 9 18:49:51 EST 2011
Author: jralls
Date: 2011-12-09 18:49:50 -0500 (Fri, 09 Dec 2011)
New Revision: 21701
Trac: http://svn.gnucash.org/trac/changeset/21701
Modified:
gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c
gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c
gnucash/trunk/src/backend/dbi/test/test-dbi-business.c
gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c
gnucash/trunk/src/backend/dbi/test/test-dbi.c
Log:
[Testing] Suppress verbose messages, expected warnings in backend/dbi checks.
Modified: gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c 2011-12-09 23:49:41 UTC (rev 21700)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi-basic.c 2011-12-09 23:49:50 UTC (rev 21701)
@@ -42,20 +42,28 @@
static QofSession*
create_session(void)
{
- QofSession* session = qof_session_new();
- QofBook* book = qof_session_get_book( session );
- Account* root = gnc_book_get_root_account( book );
- Account* acct1;
- Account* acct2;
+ QofSession* session;
+ QofBook* book;
+ Account *root, *acct1, *acct2;
KvpFrame* frame;
Transaction* tx;
- Split* spl1;
- Split* spl2;
+ Split *spl1, *spl2;
Timespec ts;
struct timeval tv;
gnc_commodity_table* table;
gnc_commodity* currency;
+ gchar *msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
+ gchar *log_domain = "gnc.backend.dbi";
+ guint loglevel = G_LOG_LEVEL_WARNING, hdlr;
+ TestErrorStruct check = { loglevel, log_domain, msg };
+ hdlr = g_log_set_handler (log_domain, loglevel,
+ (GLogFunc)test_checked_handler, &check);
+ session = qof_session_new();
+ book = qof_session_get_book( session );
+ root = gnc_book_get_root_account( book );
+ g_log_remove_handler (log_domain, hdlr);
+
table = gnc_commodity_table_get_table( book );
currency = gnc_commodity_table_lookup( table, GNC_COMMODITY_NS_CURRENCY, "CAD" );
@@ -110,13 +118,13 @@
// Create a session with data
session_1 = create_session();
filename = tempnam( "/tmp", "test-sqlite3-" );
- printf( "Using filename: %s\n", filename );
+ g_test_message ( "Using filename: %s\n", filename );
test_dbi_store_and_reload( "sqlite3", session_1, filename );
session_1 = create_session();
test_dbi_safe_save( "sqlite3", filename );
test_dbi_version_control( "sqlite3", filename );
#ifdef TEST_MYSQL_URL
- printf( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
+ g_test_message ( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
if ( strlen( TEST_MYSQL_URL ) > 0 )
{
session_1 = create_session();
@@ -127,7 +135,7 @@
}
#endif
#ifdef TEST_PGSQL_URL
- printf( "TEST_PGSQL_URL='%s'\n", TEST_PGSQL_URL );
+ g_test_message ( "TEST_PGSQL_URL='%s'\n", TEST_PGSQL_URL );
if ( strlen( TEST_PGSQL_URL ) > 0 )
{
session_1 = create_session();
Modified: gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c 2011-12-09 23:49:41 UTC (rev 21700)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c 2011-12-09 23:49:50 UTC (rev 21701)
@@ -194,8 +194,13 @@
QofSession* session_2;
QofSession* session_3;
- printf( "Testing %s\n", driver );
+ gchar *msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
+ gchar *log_domain = "gnc.backend.dbi";
+ guint loglevel = G_LOG_LEVEL_WARNING, hdlr;
+ TestErrorStruct check = { loglevel, log_domain, msg };
+ g_test_message ( "Testing %s\n", driver );
+
// Save the session data
session_2 = qof_session_new();
qof_session_begin( session_2, url, FALSE, TRUE, TRUE );
@@ -213,7 +218,10 @@
qof_session_destroy( session_1 );
qof_session_end( session_2 );
qof_session_destroy( session_2 );
- g_print(" You may ignore the warning about the lock file having no entries: We had to ignore locking to run two sessions on the same database\n");
+
+ hdlr = g_log_set_handler (log_domain, loglevel,
+ (GLogFunc)test_checked_handler, &check);
qof_session_end( session_3 );
+ g_log_remove_handler (log_domain, hdlr);
qof_session_destroy( session_3 );
}
Modified: gnucash/trunk/src/backend/dbi/test/test-dbi-business.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi-business.c 2011-12-09 23:49:41 UTC (rev 21700)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi-business.c 2011-12-09 23:49:50 UTC (rev 21701)
@@ -167,16 +167,16 @@
// Create a session with data
session_1 = create_session();
filename = tempnam( "/tmp", "test-sqlite3-" );
- printf( "Using filename: %s\n", filename );
+ g_test_message ( "Using filename: %s\n", filename );
test_dbi_business_store_and_reload( "sqlite3", session_1, filename );
#if 0
- printf( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
+ g_test_message ( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
if ( strlen( TEST_MYSQL_URL ) > 0 )
{
session_1 = create_session();
test_dbi_store_and_reload( "mysql", session_1, TEST_MYSQL_URL );
}
- printf( "TEST_PGSQL_URL='%s'\n", TEST_PGSQL_URL );
+ g_test_message ( "TEST_PGSQL_URL='%s'\n", TEST_PGSQL_URL );
if ( strlen( TEST_PGSQL_URL ) > 0 )
{
session_1 = create_session();
Modified: gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c 2011-12-09 23:49:41 UTC (rev 21700)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c 2011-12-09 23:49:50 UTC (rev 21701)
@@ -139,7 +139,7 @@
{
GncDbiBackend *be = (GncDbiBackend*)qbe;
GSList *index_list = ((GncDbiSqlConnection*)(be->sql_be.conn))->provider->get_index_list( be->conn );
- g_print ( "Returned from index list\n");
+ g_test_message ( "Returned from index list\n");
if ( index_list == NULL )
{
do_test( FALSE, "Index List Test -- No List" );
@@ -170,10 +170,17 @@
QofSession* session_2;
QofSession* session_3;
- printf( "Testing %s\n", driver );
+ gchar *msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
+ gchar *log_domain = "gnc.backend.dbi";
+ guint loglevel = G_LOG_LEVEL_WARNING, hdlr;
+ TestErrorStruct check = { loglevel, log_domain, msg };
+ g_test_message ( "Testing %s\n", driver );
+
// Save the session data
session_2 = qof_session_new();
+ hdlr = g_log_set_handler (log_domain, loglevel,
+ (GLogFunc)test_checked_handler, &check);
qof_session_begin( session_2, url, FALSE, TRUE, TRUE );
if (session_2 && qof_session_get_error(session_2) != ERR_BACKEND_NO_ERR)
{
@@ -212,9 +219,9 @@
qof_session_destroy( session_1 );
qof_session_end( session_2 );
qof_session_destroy( session_2 );
- g_print(" You may ignore the warning about the lock file having no entries: We had to ignore locking to run two sessions on the same database\n");
qof_session_end( session_3 );
qof_session_destroy( session_3 );
+ g_log_remove_handler (log_domain, hdlr);
}
/* Given an already-created url (yeah, bad testing practice: Should
@@ -229,8 +236,13 @@
{
QofSession *session_1 = NULL, *session_2 = NULL;
- printf( "Testing safe save %s\n", driver );
+ gchar *msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
+ gchar *log_domain = "gnc.backend.dbi";
+ guint loglevel = G_LOG_LEVEL_WARNING, hdlr;
+ TestErrorStruct check = { loglevel, log_domain, msg };
+ g_test_message ( "Testing safe save %s\n", driver );
+
// Load the session data
session_1 = qof_session_new();
qof_session_begin( session_1, url, TRUE, FALSE, FALSE );
@@ -266,6 +278,8 @@
qof_session_get_book( session_2 ) );
cleanup:
+ hdlr = g_log_set_handler (log_domain, loglevel,
+ (GLogFunc)test_checked_handler, &check);
if (session_2 != NULL)
{
qof_session_end( session_2 );
@@ -276,6 +290,7 @@
qof_session_end( session_1 );
qof_session_destroy( session_1 );
}
+ g_log_remove_handler (log_domain, hdlr);
return;
}
@@ -293,7 +308,7 @@
QofBackendError err;
gint ourversion = gnc_get_long_version();
- printf( "Testing safe save %s\n", driver );
+ g_test_message ( "Testing safe save %s\n", driver );
// Load the session data
sess = qof_session_new();
Modified: gnucash/trunk/src/backend/dbi/test/test-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi.c 2011-12-09 23:49:41 UTC (rev 21700)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi.c 2011-12-09 23:49:50 UTC (rev 21701)
@@ -56,10 +56,10 @@
qof_session_load( session_1, NULL );
filename = tempnam( "/tmp", "test-sqlite3-" );
- printf( "Using filename: %s\n", filename );
+ g_test_message ( "Using filename: %s\n", filename );
test_dbi_store_and_reload( "sqlite3", session_1, filename );
- printf( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
+ g_test_message ( "TEST_MYSQL_URL='%s'\n", TEST_MYSQL_URL );
if ( strlen( TEST_MYSQL_URL ) > 0 )
{
session_1 = qof_session_new();
@@ -68,7 +68,7 @@
test_dbi_store_and_reload( "mysql", session_1, TEST_MYSQL_URL );
}
- printf( "TEST_PGSQL_URL='%s'\n", TEST_PGSQL_URL );
+ g_test_message ( "TEST_PGSQL_URL='%s'\n", TEST_PGSQL_URL );
if ( strlen( TEST_PGSQL_URL ) > 0 )
{
session_1 = qof_session_new();
More information about the gnucash-changes
mailing list