Date: Wednesday, December 20, 2006 @ 21:19:40
Author: gilles
Path: /cvsroot/carob/carob/test
Modified: CarobTestLauncher.cpp (1.38 -> 1.39)
as ControllerInfo ctor can throw exception, put them inside try/catch to
prevent sigaborts
-----------------------+
CarobTestLauncher.cpp | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
Index: carob/test/CarobTestLauncher.cpp
diff -u carob/test/CarobTestLauncher.cpp:1.38
carob/test/CarobTestLauncher.cpp:1.39
--- carob/test/CarobTestLauncher.cpp:1.38 Wed Dec 20 19:27:47 2006
+++ carob/test/CarobTestLauncher.cpp Wed Dec 20 21:19:40 2006
@@ -70,20 +70,20 @@
bool needToCreateTestTables()
{
vector<ControllerInfo> ctrls;
- ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
- ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST2,
ConnectionSetup::DEFAULT_PORT2));
- ConnectionParameters connectionPrms(ctrls,
- ConnectionSetup::DEFAULT_DB,
- ConnectionSetup::DEFAULT_USER,
- ConnectionSetup::DEFAULT_PASSWD,
- ConnectionSetup::DEFAULT_POLICY,
- ConnectionSetup::DEFAULT_PING_DELAY,
-
ConnectionSetup::DEFAULT_CONTROLLER_TIMEOUT,
-
ConnectionSetup::DEFAULT_CONNECTION_PERSISTENCY,
-
ConnectionSetup::DEFAULT_RETRIEVE_SQL_WARNINGS);
Connection* connectionPtr = NULL;
try
{
+ ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
+ ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST2,
ConnectionSetup::DEFAULT_PORT2));
+ ConnectionParameters connectionPrms(ctrls,
+ ConnectionSetup::DEFAULT_DB,
+ ConnectionSetup::DEFAULT_USER,
+ ConnectionSetup::DEFAULT_PASSWD,
+ ConnectionSetup::DEFAULT_POLICY,
+ ConnectionSetup::DEFAULT_PING_DELAY,
+
ConnectionSetup::DEFAULT_CONTROLLER_TIMEOUT,
+
ConnectionSetup::DEFAULT_CONNECTION_PERSISTENCY,
+
ConnectionSetup::DEFAULT_RETRIEVE_SQL_WARNINGS);
connectionPtr = new Connection(connectionPrms);
}
catch (CarobException e)
@@ -120,20 +120,20 @@
return false;
}
vector<ControllerInfo> ctrls;
- ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
- ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST2,
ConnectionSetup::DEFAULT_PORT2));
- ConnectionParameters connectionPrms(ctrls,
- ConnectionSetup::DEFAULT_DB,
- ConnectionSetup::DEFAULT_USER,
- ConnectionSetup::DEFAULT_PASSWD,
- ConnectionSetup::DEFAULT_POLICY,
- ConnectionSetup::DEFAULT_PING_DELAY,
-
ConnectionSetup::DEFAULT_CONTROLLER_TIMEOUT,
-
ConnectionSetup::DEFAULT_CONNECTION_PERSISTENCY,
-
ConnectionSetup::DEFAULT_RETRIEVE_SQL_WARNINGS);
Connection* connectionPtr = NULL;
try
{
+ ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
+ ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST2,
ConnectionSetup::DEFAULT_PORT2));
+ ConnectionParameters connectionPrms(ctrls,
+ ConnectionSetup::DEFAULT_DB,
+ ConnectionSetup::DEFAULT_USER,
+ ConnectionSetup::DEFAULT_PASSWD,
+ ConnectionSetup::DEFAULT_POLICY,
+ ConnectionSetup::DEFAULT_PING_DELAY,
+
ConnectionSetup::DEFAULT_CONTROLLER_TIMEOUT,
+
ConnectionSetup::DEFAULT_CONNECTION_PERSISTENCY,
+
ConnectionSetup::DEFAULT_RETRIEVE_SQL_WARNINGS);
connectionPtr = new Connection(connectionPrms);
}
catch (CarobException e)
@@ -232,7 +232,7 @@
if (ok)
{
// to get debug info:
- // setLogLevel(LOG_LEVEL_DEBUG);
+ setLogLevel(LOG_LEVEL_DEBUG);
// To run only one test:
// runner.run("TestConnect::testConnectGood");
runner.run();
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
