[devel] [PATCH 2/4] lck: resurrect apitests [#2437]

[Alex Jones]

Resurrect apitests
---
 src/lck/apitest/test_ErrUnavailable.cc     |  2 +-
 src/lck/apitest/test_saLckLimitGet.cc      |  2 +-
 src/lck/apitest/test_saLckResourceClass.cc | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/lck/apitest/test_ErrUnavailable.cc 
b/src/lck/apitest/test_ErrUnavailable.cc
index ff1548296..db1e0b72f 100644
--- a/src/lck/apitest/test_ErrUnavailable.cc
+++ b/src/lck/apitest/test_ErrUnavailable.cc
@@ -6,8 +6,8 @@
 #include <string>
 #include <poll.h>
 #include <unistd.h>
+#include "ais/include/saLck.h"
 #include "lck/apitest/lcktest.h"
-#include "lck/saf/saLck.h"
 
 static SaVersionT lck3_1 = { 'B', 3, 0 };
 
diff --git a/src/lck/apitest/test_saLckLimitGet.cc 
b/src/lck/apitest/test_saLckLimitGet.cc
index e187c5885..1236b47bf 100644
--- a/src/lck/apitest/test_saLckLimitGet.cc
+++ b/src/lck/apitest/test_saLckLimitGet.cc
@@ -3,8 +3,8 @@
 #include <cstring>
 #include <iostream>
 #include <poll.h>
+#include "ais/include/saLck.h"
 #include "lck/apitest/lcktest.h"
-#include "lck/saf/saLck.h"
 
 static SaVersionT lck3_1 = { 'B', 3, 0 };
 
diff --git a/src/lck/apitest/test_saLckResourceClass.cc 
b/src/lck/apitest/test_saLckResourceClass.cc
index fada9e4fb..106ca87c4 100644
--- a/src/lck/apitest/test_saLckResourceClass.cc
+++ b/src/lck/apitest/test_saLckResourceClass.cc
@@ -1,12 +1,13 @@
 #include <cassert>
 #include <cstdio>
 #include <cstring>
+#include <iostream>
 #include <poll.h>
 #include <unistd.h>
-#include "imm/saf/saImm.h"
-#include "imm/saf/saImmOm.h"
+#include "ais/include/saImm.h"
+#include "ais/include/saImmOm.h"
+#include "ais/include/saLck.h"
 #include "lck/apitest/lcktest.h"
-#include "lck/saf/saLck.h"
 
 static SaVersionT lck3_1 = { 'B', 3, 0 };
 
@@ -69,6 +70,8 @@ static void verifyOutput(SaUint32T strippedCount,
   SaImmAttrValuesT_2 **attributes(0);
 
   SaAisErrorT rc(saImmOmAccessorGet_2(accessorHandle, &resourceName, names, 
&attributes));
+  if (rc != SA_AIS_OK)
+    std::cerr << "saImmOmAccessorGet_2 returned: " << rc << std::endl;
   assert(rc == SA_AIS_OK);
 
   int i(0);
@@ -105,6 +108,7 @@ static void saLckResourceClass_01(void)
                          &lockResourceHandle);
   assert(rc == SA_AIS_OK);
 
+  sleep(1);
   verifyOutput(0, 1, false);
 
   rc = saLckResourceClose(lockResourceHandle);
-- 
2.13.6


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel