From 94f946973895eff00f7768430f7cabbf01412ca0 Mon Sep 17 00:00:00 2001
From: prabatuty <prabatuty>
Date: Sun, 22 May 2011 13:34:25 +0000
Subject: [PATCH] fixing timing issue in test script

---
 test/dbapi/Connection/common.h    | 8 ++++----
 test/dbapi/Connection/isotest1.c  | 1 +
 test/dbapi/Connection/isotest10.c | 1 +
 test/dbapi/Connection/isotest11.c | 1 +
 test/dbapi/Connection/isotest12.c | 1 +
 test/dbapi/Connection/isotest13.c | 1 +
 test/dbapi/Connection/isotest14.c | 1 +
 test/dbapi/Connection/isotest15.c | 1 +
 test/dbapi/Connection/isotest16.c | 1 +
 test/dbapi/Connection/isotest17.c | 1 +
 test/dbapi/Connection/isotest18.c | 1 +
 test/dbapi/Connection/isotest19.c | 1 +
 test/dbapi/Connection/isotest2.c  | 1 +
 test/dbapi/Connection/isotest20.c | 1 +
 test/dbapi/Connection/isotest21.c | 1 +
 test/dbapi/Connection/isotest22.c | 1 +
 test/dbapi/Connection/isotest23.c | 1 +
 test/dbapi/Connection/isotest24.c | 1 +
 test/dbapi/Connection/isotest25.c | 1 +
 test/dbapi/Connection/isotest26.c | 1 +
 test/dbapi/Connection/isotest27.c | 1 +
 test/dbapi/Connection/isotest28.c | 1 +
 test/dbapi/Connection/isotest29.c | 1 +
 test/dbapi/Connection/isotest3.c  | 1 +
 test/dbapi/Connection/isotest30.c | 1 +
 test/dbapi/Connection/isotest4.c  | 1 +
 test/dbapi/Connection/isotest5.c  | 1 +
 test/dbapi/Connection/isotest6.c  | 1 +
 test/dbapi/Connection/isotest7.c  | 1 +
 test/dbapi/Connection/isotest8.c  | 3 ++-
 test/dbapi/Connection/isotest9.c  | 1 +
 31 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/test/dbapi/Connection/common.h b/test/dbapi/Connection/common.h
index bb772960..20cd603b 100644
--- a/test/dbapi/Connection/common.h
+++ b/test/dbapi/Connection/common.h
@@ -35,7 +35,7 @@ DbRetVal insert(DatabaseManager *dbMgr, int val, bool isSleep)
     ret = table->insertTuple();
     if (ret != 0) { dbMgr->closeTable(table);  return ErrLockTimeOut; }
     printf("Inserted tuple : %d %s\n", val, name);
-    if (isSleep) ::sleep(5);
+    if (isSleep) os::sleep(5);
     dbMgr->closeTable(table);
     return OK;
 }
@@ -62,7 +62,7 @@ DbRetVal select(DatabaseManager *dbMgr, int val, bool isSleep, bool checkUpd=fal
         return ErrUnknown; 
     }
     printf("ThreadID: %lu Tuple %d %s\n", os::getthrid(), id, name);
-    if (isSleep) ::sleep(5);
+    if (isSleep) os::sleep(5);
     dbMgr->closeTable(table);
     if ( checkUpd && strcmp(name, "KANCHANA") != 0)  return ErrUnknown; 
     return OK;
@@ -91,7 +91,7 @@ DbRetVal update(DatabaseManager *dbMgr, int val, bool isSleep, char *updname = N
     if (rv != OK) { dbMgr->closeTable(table); return ErrUnknown; }
     printf("ThreadID: %lu Updated Tuple %d %s\n", os::getthrid(), id, name);
 
-    if (isSleep) ::sleep(2);
+    if (isSleep) os::sleep(5);
     dbMgr->closeTable(table);
     return OK;
 }
@@ -117,7 +117,7 @@ DbRetVal remove(DatabaseManager *dbMgr, int val, bool isSleep)
     if (rv != OK) { dbMgr->closeTable(table); return ErrUnknown; }
     printf("ThreadID: %lu Deleted Tuple %d %s\n", os::getthrid(), id, name);
 
-    if (isSleep) ::sleep(2);
+    if (isSleep) os::sleep(5);
     dbMgr->closeTable(table);
     return OK;
 }
diff --git a/test/dbapi/Connection/isotest1.c b/test/dbapi/Connection/isotest1.c
index bb2793e1..875b5325 100644
--- a/test/dbapi/Connection/isotest1.c
+++ b/test/dbapi/Connection/isotest1.c
@@ -58,6 +58,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest10.c b/test/dbapi/Connection/isotest10.c
index e3bcc209..3d5296a4 100644
--- a/test/dbapi/Connection/isotest10.c
+++ b/test/dbapi/Connection/isotest10.c
@@ -74,6 +74,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest11.c b/test/dbapi/Connection/isotest11.c
index 07b421f8..0da010b9 100644
--- a/test/dbapi/Connection/isotest11.c
+++ b/test/dbapi/Connection/isotest11.c
@@ -55,6 +55,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest12.c b/test/dbapi/Connection/isotest12.c
index 5f621216..c08fe56b 100644
--- a/test/dbapi/Connection/isotest12.c
+++ b/test/dbapi/Connection/isotest12.c
@@ -60,6 +60,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest13.c b/test/dbapi/Connection/isotest13.c
index 83e4b33b..b8f3dca4 100644
--- a/test/dbapi/Connection/isotest13.c
+++ b/test/dbapi/Connection/isotest13.c
@@ -60,6 +60,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest14.c b/test/dbapi/Connection/isotest14.c
index 78c4eb90..a2e06740 100644
--- a/test/dbapi/Connection/isotest14.c
+++ b/test/dbapi/Connection/isotest14.c
@@ -63,6 +63,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest15.c b/test/dbapi/Connection/isotest15.c
index 69f5b8d0..275a5ed9 100644
--- a/test/dbapi/Connection/isotest15.c
+++ b/test/dbapi/Connection/isotest15.c
@@ -61,6 +61,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest16.c b/test/dbapi/Connection/isotest16.c
index eed76dfd..4be7e1a3 100644
--- a/test/dbapi/Connection/isotest16.c
+++ b/test/dbapi/Connection/isotest16.c
@@ -62,6 +62,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest17.c b/test/dbapi/Connection/isotest17.c
index 1967a95c..b4a25fc4 100644
--- a/test/dbapi/Connection/isotest17.c
+++ b/test/dbapi/Connection/isotest17.c
@@ -60,6 +60,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest18.c b/test/dbapi/Connection/isotest18.c
index d94fefb7..ee1d5788 100644
--- a/test/dbapi/Connection/isotest18.c
+++ b/test/dbapi/Connection/isotest18.c
@@ -67,6 +67,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest19.c b/test/dbapi/Connection/isotest19.c
index 471a4c03..ab555d21 100644
--- a/test/dbapi/Connection/isotest19.c
+++ b/test/dbapi/Connection/isotest19.c
@@ -66,6 +66,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest2.c b/test/dbapi/Connection/isotest2.c
index eb97edcb..514733c5 100644
--- a/test/dbapi/Connection/isotest2.c
+++ b/test/dbapi/Connection/isotest2.c
@@ -64,6 +64,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest20.c b/test/dbapi/Connection/isotest20.c
index c253076d..785b7a69 100644
--- a/test/dbapi/Connection/isotest20.c
+++ b/test/dbapi/Connection/isotest20.c
@@ -69,6 +69,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest21.c b/test/dbapi/Connection/isotest21.c
index 9833d038..1bd35ade 100644
--- a/test/dbapi/Connection/isotest21.c
+++ b/test/dbapi/Connection/isotest21.c
@@ -55,6 +55,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest22.c b/test/dbapi/Connection/isotest22.c
index 297e93f7..c726b66a 100644
--- a/test/dbapi/Connection/isotest22.c
+++ b/test/dbapi/Connection/isotest22.c
@@ -60,6 +60,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest23.c b/test/dbapi/Connection/isotest23.c
index b9f20906..703e7422 100644
--- a/test/dbapi/Connection/isotest23.c
+++ b/test/dbapi/Connection/isotest23.c
@@ -61,6 +61,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest24.c b/test/dbapi/Connection/isotest24.c
index 0f4b5d48..cc4e1182 100644
--- a/test/dbapi/Connection/isotest24.c
+++ b/test/dbapi/Connection/isotest24.c
@@ -61,6 +61,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest25.c b/test/dbapi/Connection/isotest25.c
index b457de09..cfdd32b9 100644
--- a/test/dbapi/Connection/isotest25.c
+++ b/test/dbapi/Connection/isotest25.c
@@ -61,6 +61,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest26.c b/test/dbapi/Connection/isotest26.c
index f780c5f3..efbf1f5d 100644
--- a/test/dbapi/Connection/isotest26.c
+++ b/test/dbapi/Connection/isotest26.c
@@ -62,6 +62,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest27.c b/test/dbapi/Connection/isotest27.c
index d11511c7..13476170 100644
--- a/test/dbapi/Connection/isotest27.c
+++ b/test/dbapi/Connection/isotest27.c
@@ -60,6 +60,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest28.c b/test/dbapi/Connection/isotest28.c
index 167369e4..fbb67490 100644
--- a/test/dbapi/Connection/isotest28.c
+++ b/test/dbapi/Connection/isotest28.c
@@ -67,6 +67,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest29.c b/test/dbapi/Connection/isotest29.c
index c2b7a7c8..a629f686 100644
--- a/test/dbapi/Connection/isotest29.c
+++ b/test/dbapi/Connection/isotest29.c
@@ -67,6 +67,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest3.c b/test/dbapi/Connection/isotest3.c
index 8a845180..93966f99 100644
--- a/test/dbapi/Connection/isotest3.c
+++ b/test/dbapi/Connection/isotest3.c
@@ -64,6 +64,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest30.c b/test/dbapi/Connection/isotest30.c
index 932826e2..fcd87b38 100644
--- a/test/dbapi/Connection/isotest30.c
+++ b/test/dbapi/Connection/isotest30.c
@@ -69,6 +69,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest4.c b/test/dbapi/Connection/isotest4.c
index fdb1d1ea..456929b6 100644
--- a/test/dbapi/Connection/isotest4.c
+++ b/test/dbapi/Connection/isotest4.c
@@ -66,6 +66,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest5.c b/test/dbapi/Connection/isotest5.c
index fedaa5f0..10301257 100644
--- a/test/dbapi/Connection/isotest5.c
+++ b/test/dbapi/Connection/isotest5.c
@@ -66,6 +66,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest6.c b/test/dbapi/Connection/isotest6.c
index a277f983..9ed8efb9 100644
--- a/test/dbapi/Connection/isotest6.c
+++ b/test/dbapi/Connection/isotest6.c
@@ -66,6 +66,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest7.c b/test/dbapi/Connection/isotest7.c
index e518cd1c..716989e7 100644
--- a/test/dbapi/Connection/isotest7.c
+++ b/test/dbapi/Connection/isotest7.c
@@ -66,6 +66,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
diff --git a/test/dbapi/Connection/isotest8.c b/test/dbapi/Connection/isotest8.c
index 0bef9eff..378f5635 100644
--- a/test/dbapi/Connection/isotest8.c
+++ b/test/dbapi/Connection/isotest8.c
@@ -71,6 +71,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
@@ -84,7 +85,7 @@ void* runTest2(void *message)
 
     if (rv != OK) return NULL;
     printf("Thread and pid is %d %lu\n", os::getpid(), os::getthrid());
-
+    os::sleep(1);
     p2RetVal = new int();
     *p2RetVal = 0;
     rv = update(dbMgr, 100, true, "RITHISH");
diff --git a/test/dbapi/Connection/isotest9.c b/test/dbapi/Connection/isotest9.c
index 5333ad29..276692cd 100644
--- a/test/dbapi/Connection/isotest9.c
+++ b/test/dbapi/Connection/isotest9.c
@@ -73,6 +73,7 @@ void* runTest1(void *message)
 }
 void* runTest2(void *message)
 {
+    os::sleep(1);
     Connection conn;
     DbRetVal rv = conn.open("root", "manager");
     if (rv != OK) { printf("Error during connection %d\n", rv); return NULL; }
-- 
2.11.4.GIT