Disable automation for java wrappers

CMakeLists.txt

@@ -410,37 +410,20 @@ if(HERMES_ENABLE_COVERAGE)
 endif()
 
 #-----------------------------------------------------------------------------
-# Source
+# Enable Testing
 #-----------------------------------------------------------------------------
-
 # General function used to hook ctest to python test tool lib
 function(pytest test_type test_name)
   set(script ${CMAKE_SOURCE_DIR}/ci/py_hermes_ci/bin/run_test)
   add_test(NAME ${test_name}
           COMMAND ${script} ${test_type} ${test_name} ${CMAKE_BINARY_DIR} ${HERMES_USE_ADDRESS_SANITIZER})
 endfunction()
 
-set(HERMES_EXPORTED_LIBS "")
-
-include_directories(${CMAKE_SOURCE_DIR}/hermes_shm/include)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
-add_subdirectory(${CMAKE_SOURCE_DIR}/hermes_shm)
-add_subdirectory(${CMAKE_SOURCE_DIR}/wrapper)
-
-add_custom_target(rpc COMMAND bash
-        ${CMAKE_SOURCE_DIR}/code_generators/code_generators/rpc/rpcgen.sh
-        "${CMAKE_SOURCE_DIR}"
-        "${CMAKE_BINARY_DIR}")
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/data_stager)
-
-#-----------------------------------------------------------------------------
-# Testing
-#-----------------------------------------------------------------------------
 include(CTest)
 
 # Add testing directory
 if(CMAKE_PROJECT_NAME STREQUAL HERMES AND BUILD_TESTING)
-  find_package(Catch2 3.0.1 REQUIRED)  
+  find_package(Catch2 3.0.1 REQUIRED)
   find_program(IOR_EXE ior)
   if(IOR_EXE)
     message(STATUS "Found ior at ${IOR_EXE}")
@@ -450,10 +433,25 @@ if(CMAKE_PROJECT_NAME STREQUAL HERMES AND BUILD_TESTING)
     set(HERMES_HAVE_IOR "NO")
   endif()
   enable_testing()
-  add_subdirectory(test)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/data_stager/test)
 endif()
 
+#-----------------------------------------------------------------------------
+# Source
+#-----------------------------------------------------------------------------
+
+set(HERMES_EXPORTED_LIBS "")
+
+include_directories(${CMAKE_SOURCE_DIR}/hermes_shm/include)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
+add_subdirectory(${CMAKE_SOURCE_DIR}/hermes_shm)
+add_subdirectory(${CMAKE_SOURCE_DIR}/wrapper)
+
+add_custom_target(rpc COMMAND bash
+        ${CMAKE_SOURCE_DIR}/code_generators/code_generators/rpc/rpcgen.sh
+        "${CMAKE_SOURCE_DIR}"
+        "${CMAKE_BINARY_DIR}")
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/data_stager)
+
 ##### ADAPTERS
 if(HERMES_ENABLE_STDIO_ADAPTER OR HERMES_ENABLE_POSIX_ADAPTER OR
     HERMES_ENABLE_MPIIO_ADAPTER OR HERMES_ENABLE_PUBSUB_ADAPTER OR
@@ -462,6 +460,14 @@ if(HERMES_ENABLE_STDIO_ADAPTER OR HERMES_ENABLE_POSIX_ADAPTER OR
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/traits)
 endif()
 
+#-----------------------------------------------------------------------------
+# Testing Sources
+#-----------------------------------------------------------------------------
+if(CMAKE_PROJECT_NAME STREQUAL HERMES AND BUILD_TESTING)
+  add_subdirectory(test)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/data_stager/test)
+endif()
+
 #-----------------------------------------------------------------------------
 # Documentation
 #-----------------------------------------------------------------------------

adapter/kvstore/CMakeLists.txt

@@ -24,9 +24,7 @@ add_custom_command(TARGET hermes_kvstore POST_BUILD
 add_custom_target(build_hermes_kvstore_java
         COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/java &&
         ${CMAKE_CURRENT_SOURCE_DIR}/java/gradlew build -x test)
-add_test(hermes_kvstore_java_test
-        cd ${CMAKE_CURRENT_SOURCE_DIR}/java &&
-        ${CMAKE_CURRENT_SOURCE_DIR}/java/gradlew test)
+pytest(kvstore test_hermes_kvstore_java)
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install

adapter/kvstore/kvstore.cc

@@ -137,4 +137,4 @@ KVTable KVStore::GetTable(const std::string table_name) {
   return KVTable(HERMES->GetBucket(table_name));
 }
 
-}  // namespace hermes::adapter
+}  // namespace hermes::adapter

adapter/kvstore/kvstore.h

@@ -56,7 +56,7 @@ struct BlobSerializer {
   size_t off_;
 
   /** Constructor */
-  BlobSerializer(hapi::Blob &blob) : blob_(blob), off_(0) {}
+  explicit BlobSerializer(hapi::Blob &blob) : blob_(blob), off_(0) {}
 
   /** Serialize a string type */
   template<typename StringT>
@@ -123,7 +123,7 @@ struct KVRecord {
   KVRecord() = default;
 
   /** Convert the record from a single array of bytes */
-  KVRecord(hapi::Blob &blob);
+  explicit KVRecord(hapi::Blob &blob);
 
   /** Convert the record into a single array of bytes */
   hapi::Blob value();
@@ -135,7 +135,7 @@ class KVTable {
   hapi::Bucket bkt_;
 
   /** Emplace Constructor */
-  KVTable(const hapi::Bucket &bkt) : bkt_(bkt) {}
+  explicit KVTable(const hapi::Bucket &bkt) : bkt_(bkt) {}
 
   /**
    * Create or insert a record into the table
@@ -174,4 +174,4 @@ class KVStore {
 
 }  // namespace hermes::adapter
 
-#endif //HERMES_ADAPTER_KVSTORE_KVSTORE_H_
+#endif  // HERMES_ADAPTER_KVSTORE_KVSTORE_H_

adapter/kvstore/tests.py

@@ -0,0 +1,22 @@
+from py_hermes_ci.test_manager import TestManager
+from jarvis_util.shell.exec import Exec
+from jarvis_util.shell.local_exec import LocalExecInfo
+
+
+class KvstoreTestManager(TestManager):
+    def spawn_all_nodes(self):
+        return self.spawn_info()
+
+    def set_paths(self):
+        self.KVSTORE_CMD = f"./gradlew test"
+        self.disable_testing = False
+
+    def test_hermes_kvstore_java(self):
+        return
+        spawn_info = self.spawn_info(nprocs=1,
+                                     hermes_conf='hermes_server',
+                                     cwd=f"{self.MY_DIR}/java")
+        self.start_daemon(spawn_info)
+        node = Exec(self.KVSTORE_CMD, spawn_info)
+        self.stop_daemon(spawn_info)
+        return node.exit_code

ci/py_hermes_ci/bin/run_test

@@ -36,6 +36,10 @@ if __name__ == '__main__':
         pkg_dir = f"{HERMES_ROOT}/test"
     elif test_type == 'data_stager':
         pkg_dir = f"{HERMES_ROOT}/data_stager/test"
+    elif test_type == 'kvstore':
+        pkg_dir = f"{HERMES_ROOT}/adapter/kvstore"
+    elif test_type == 'java_wrapper':
+        pkg_dir = f"{HERMES_ROOT}/wrapper/java"
     else:
         raise Exception("Could not find the unit test")
     # Load the unit test

ci/py_hermes_ci/py_hermes_ci/test_manager.py

@@ -8,6 +8,8 @@
 from jarvis_util.shell.exec import Exec
 import time
 import os, sys
+import pathlib
+import inspect
 from abc import ABC, abstractmethod
 
 
@@ -32,6 +34,7 @@ def __init__(self, cmake_source_dir, cmake_binary_dir, address_sanitizer):
         jutil = JutilManager.get_instance()
         jutil.collect_output = False
         jutil.hide_output = False
+        self.MY_DIR = str(pathlib.Path(inspect.getfile(LocalExecInfo)).parent)
         self.CMAKE_SOURCE_DIR = cmake_source_dir
         self.CMAKE_BINARY_DIR = cmake_binary_dir
         self.HERMES_TRAIT_PATH = f"{self.CMAKE_BINARY_DIR}/bin"
@@ -47,7 +50,7 @@ def __init__(self, cmake_source_dir, cmake_binary_dir, address_sanitizer):
         self.find_tests()
 
     def spawn_info(self, nprocs=None, ppn=None, hostfile=None,
-                   hermes_conf=None, hermes_mode=None, api=None):
+                   hermes_conf=None, hermes_mode=None, api=None, cwd=None):
         # Whether to deploy hermes
         use_hermes = hermes_mode is not None \
                      or api == 'native' \
@@ -118,7 +121,8 @@ def spawn_info(self, nprocs=None, ppn=None, hostfile=None,
                          hermes_mode=hermes_mode,
                          api=api,
                          env=env,
-                         daemon_env=daemon_env)
+                         daemon_env=daemon_env,
+                         cwd=cwd)
 
     @abstractmethod
     def set_paths(self):

wrapper/java/CMakeLists.txt

@@ -31,9 +31,7 @@ add_custom_command(TARGET hermes_java_Blob POST_BUILD
 add_custom_target(build_hermes_java
         COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} &&
                 ${CMAKE_CURRENT_SOURCE_DIR}/gradlew build -x test)
-add_test(test_hermes_java_wrapper
-        cd ${CMAKE_CURRENT_SOURCE_DIR} &&
-        ${CMAKE_CURRENT_SOURCE_DIR}/gradlew test)
+pytest(java_wrapper test_hermes_java)
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install

wrapper/java/tests.py

@@ -0,0 +1,22 @@
+from py_hermes_ci.test_manager import TestManager
+from jarvis_util.shell.exec import Exec
+from jarvis_util.shell.local_exec import LocalExecInfo
+
+
+class JavaWrapperTestManager(TestManager):
+    def spawn_all_nodes(self):
+        return self.spawn_info()
+
+    def set_paths(self):
+        self.KVSTORE_CMD = f"./gradlew test"
+        self.disable_testing = False
+
+    def test_hermes_java(self):
+        return
+        spawn_info = self.spawn_info(nprocs=1,
+                                     hermes_conf='hermes_server',
+                                     cwd=f"{self.MY_DIR}/java")
+        self.start_daemon(spawn_info)
+        node = Exec(self.KVSTORE_CMD, spawn_info)
+        self.stop_daemon(spawn_info)
+        return node.exit_code