WIP: disable all tests except put_directory; verified no memory leaks; need to tweak for multiple threads

DenverM80 · DenverM80 · commit 5cafcefe6116 · 2017-07-18T16:54:46.000-06:00
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -64,19 +64,19 @@ else(WIN32) # POSIX
 endif(WIN32)
 
 add_executable(ds3_c_tests
-  bucket_tests.cpp
-  bulk_get.cpp
-  bulk_put.cpp
-  checksum.cpp
-  deletes_test.cpp
-  get_physical_placement.cpp
-  job_tests.cpp
-  metadata_tests.cpp
-  multimap_tests.cpp
-  negative_tests.cpp
-  search_tests.cpp
-  service_tests.cpp
-  connection_tests.cpp
+  #bucket_tests.cpp
+  #bulk_get.cpp
+  #bulk_put.cpp
+  #checksum.cpp
+  #deletes_test.cpp
+  #get_physical_placement.cpp
+  #job_tests.cpp
+  #metadata_tests.cpp
+  #multimap_tests.cpp
+  #negative_tests.cpp
+  #search_tests.cpp
+  #service_tests.cpp
+  #connection_tests.cpp
   put_directory.cpp
   test.cpp)
 
diff --git a/test/put_directory.cpp b/test/put_directory.cpp
@@ -22,50 +22,53 @@
 #include <inttypes.h>
 #include "ds3.h"
 #include "ds3_net.h"
+#include "ds3_utils.h"
 #include "test.h"
 
-struct check_ds3_test_directory_given {
-    return getenv(DS3_TEST_DIRECTORY) != NULL;
+namespace utf = boost::unit_test;
+
+bool check_ds3_test_directory_given() {
+    return getenv("DS3_TEST_DIRECTORY") != NULL;
 };
 
-BOOST_AUTO_TEST_CASE( put_directory,
-                      * boost::unit_test::precondition(check_ds3_test_directory_given)) {
+BOOST_AUTO_TEST_CASE( put_directory) {
+                      //* boost::unit_test::precondition(check_ds3_test_directory_given)) {
     printf("-----Testing PUT all objects in a directory-------\n");
 
     const char* dir_path = getenv("DS3_TEST_DIRECTORY");
     BOOST_CHECK(dir_path != NULL);
 
     const char* bucket_name = "test_bulk_put_directory";
-
-    ds3_request* request = NULL;
-    ds3_master_object_list_response* bulk_response = NULL;
+    printf("  Putting all files in [%s] to bucket [%s]\n", dir_path, bucket_name);
 
     ds3_client* client = get_client();
     int client_thread=1;
     ds3_client_register_logging(client, DS3_DEBUG, test_log, (void*)&client_thread); // Use DEBUG level logging
 
     ds3_error* error = create_bucket_with_data_policy(client, bucket_name, ids.data_policy_id->value);
 
-    char** objects_list;
+    char* objects_list[100];
     uint64_t num_objs = 0;
     GDir* dir_info = g_dir_open(dir_path, 0, NULL);
     for (char* current_obj = (char*)g_dir_read_name(dir_info); current_obj != NULL; current_obj = (char*)g_dir_read_name(dir_info)) {
         objects_list[num_objs++] = current_obj;
+        printf("  obj[%" PRIu64 "][%s]\n", num_objs, objects_list[num_objs-1]);
     }
 
-    ds3_bulk_object_list_response* bulk_object_list = ds3_convert_object_list_from_strings((const char**)objects_list, num_objs);
+    ds3_bulk_object_list_response* bulk_object_list = ds3_convert_file_list_with_basepath((const char**)objects_list, num_objs, dir_path);
 
-    request = ds3_init_put_bulk_job_spectra_s3_request(bucket_name, bulk_object_list);
+    ds3_request* request = ds3_init_put_bulk_job_spectra_s3_request(bucket_name, bulk_object_list);
     ds3_master_object_list_response* mol;
     error = ds3_put_bulk_job_spectra_s3_request(client, request, &mol);
     ds3_request_free(request);
     ds3_bulk_object_list_response_free(bulk_object_list);
     handle_error(error);
 
+    // Allocate cache
     ds3_master_object_list_response* chunks_list = ensure_available_chunks(client, mol->job_id);
 
     // Use helper functions from test.cpp
-    GPtrArray* put_dir_args = new_put_chunks_threads_args(client, NULL, bucket_name, mol, chunks_list, 1, True); // Last param indicates verbose logging in the spawned thread
+    GPtrArray* put_dir_args = new_put_chunks_threads_args(client, NULL, dir_path, bucket_name, mol, chunks_list, 1, True); // Last param indicates verbose logging in the spawned thread
 
     // capture test start time
     struct timespec start_time_t, end_time_t;
@@ -80,8 +83,9 @@ BOOST_AUTO_TEST_CASE( put_directory,
     // find elapsed CPU and real time
     clock_gettime(CLOCK_MONOTONIC, &end_time_t);
     elapsed_t = timespec_to_seconds(&end_time_t) - timespec_to_seconds(&start_time_t);
-    ds3_log_message(client1->log, DS3_INFO, "  Elapsed time[%f]", elapsed_t);
+    ds3_log_message(client->log, DS3_INFO, "  Elapsed time[%f]", elapsed_t);
 
+    g_dir_close(dir_info);
     ds3_master_object_list_response_free(chunks_list);
     ds3_master_object_list_response_free(mol);
     put_chunks_threads_args_free(put_dir_args);
diff --git a/test/test.cpp b/test/test.cpp
@@ -469,20 +469,30 @@ ds3_bulk_object_list_response* create_bulk_object_list_from_prefix_with_size(con
     return obj_list;
 }
 
+/*
+ * Provide *EITHER* src_obj_name *OR* src_dir, not both
+ */
 GPtrArray* new_put_chunks_threads_args(ds3_client* client,
                                        const char* src_obj_name,
+                                       const char* src_dir,
                                        const char* dest_bucket_name,
                                        const ds3_master_object_list_response* bulk_response,
                                        ds3_master_object_list_response* available_chunks,
                                        const uint8_t num_threads,
                                        const ds3_bool verbose) {
+    if (src_obj_name && src_dir) {
+        printf("Error: provide new_put_chunks_threads_with_args() with either src_object_name or src_dir, not both\n");
+        return NULL;
+    }
+
     GPtrArray* put_chunks_args_array = g_ptr_array_new();
 
     for (uint8_t thread_index = 0; thread_index < num_threads; thread_index++) {
         put_chunks_args* put_objects_args = g_new0(put_chunks_args, 1);
         put_objects_args->client = client;
         put_objects_args->job_id = bulk_response->job_id->value;
         put_objects_args->src_object_name = (char*)src_obj_name;
+        put_objects_args->src_dir = (char*)src_dir;
         put_objects_args->bucket_name = (char*)dest_bucket_name;
         put_objects_args->chunks_list = available_chunks;
         put_objects_args->thread_num = thread_index;
@@ -528,7 +538,10 @@ void put_chunks_from_file(void* args) {
                 if (_args->src_object_name) {
                     file = fopen(_args->src_object_name, "r");
                 } else {
-                    file = fopen(object->name->value, "r");
+                    char* file_with_path = g_strconcat(_args->src_dir, object->name->value, (char*)NULL);
+                    printf("  opening file[%s]\n", file_with_path);
+                    file = fopen(file_with_path, "r");
+                    g_free(file_with_path);
                 }
                 if (object->offset != 0) {
                     fseek(file, object->offset, SEEK_SET);
diff --git a/test/test.h b/test/test.h
@@ -93,6 +93,7 @@ typedef struct {
     ds3_client*                          client;
     char*                                job_id;
     char*                                src_object_name;
+    char*                                src_dir;
     char*                                bucket_name;
     ds3_master_object_list_response*     chunks_list;
     ds3_bool                             verbose;
@@ -107,6 +108,7 @@ void test_log(const char* message, void* user_data);
  */
 GPtrArray* new_put_chunks_threads_args(ds3_client* client,
                                        const char* src_obj_name,
+                                       const char* src_dir,
                                        const char* dest_bucket_name,
                                        const ds3_master_object_list_response* bulk_response,
                                        ds3_master_object_list_response* available_chunks,
