Review update

Author: lordgamez

behave_framework/src/minifi_test_framework/containers/container.py

@@ -100,18 +100,26 @@ def deploy(self) -> bool:
     def start(self):
         if self.container:
             self.container.start()
+        else:
+            logging.error("Container does not exist. Cannot start.")
 
     def stop(self):
         if self.container:
             self.container.stop()
+        else:
+            logging.error("Container does not exist. Cannot stop.")
 
     def kill(self):
         if self.container:
             self.container.kill()
+        else:
+            logging.error("Container does not exist. Cannot kill.")
 
     def restart(self):
         if self.container:
             self.container.restart()
+        else:
+            logging.error("Container does not exist. Cannot restart.")
 
     def clean_up(self):
         if self.container:
@@ -231,10 +239,14 @@ def exited(self) -> bool:
             return False
 
     def get_number_of_files(self, directory_path: str) -> int:
-        if not self.container or not self.not_empty_dir_exists(directory_path):
-            logging.warning(f"Container not running or directory does not exist: {directory_path}")
+        if not self.container:
+            logging.warning("Container not running")
             return -1
 
+        if not self.not_empty_dir_exists(directory_path):
+            logging.warning(f"Container directory does not exist: {directory_path}")
+            return 0
+
         count_command = f"sh -c 'find {directory_path} -maxdepth 1 -type f | wc -l'"
         exit_code, output = self.exec_run(count_command)
 
@@ -314,7 +326,7 @@ def _extract_directory_from_container(self, directory_path: str, temp_dir: str)
 
             return os.path.join(temp_dir, os.path.basename(directory_path.strip('/')))
         except Exception as e:
-            logging.error(f"Error extracting files from container: {e}")
+            logging.error(f"Error extracting files from directory path '{directory_path}' from container '{self.container_name}': {e}")
             return None
 
     def _read_files_from_directory(self, directory_path: str) -> list[str] | None:

behave_framework/src/minifi_test_framework/steps/checking_steps.py

@@ -27,7 +27,7 @@
 from minifi_test_framework.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext
 
 
-@then('there is a file with "{content}" content at {path} in less than {duration}')
+@then('a file with the content "{content}" is placed on the path "{path}" in less than {duration}')
 def step_impl(context: MinifiTestContext, content: str, path: str, duration: str):
     new_content = content.replace("\\n", "\n")
     timeout_in_seconds = humanfriendly.parse_timespan(duration)
@@ -36,7 +36,7 @@ def step_impl(context: MinifiTestContext, content: str, path: str, duration: str
         timeout_seconds=timeout_in_seconds, bail_condition=lambda: context.get_default_minifi_container().exited, context=context)
 
 
-@then('there is a single file with "{content}" content in the "{directory}" directory in less than {duration}')
+@then('a single file with the content "{content}" is placed in the "{directory}" directory in less than {duration}')
 def step_impl(context: MinifiTestContext, content: str, directory: str, duration: str):
     new_content = content.replace("\\n", "\n")
     timeout_in_seconds = humanfriendly.parse_timespan(duration)
@@ -101,26 +101,27 @@ def step_impl(context: MinifiTestContext, url: str):
 @then('no files are placed in the "{directory}" directory in {duration} of running time')
 def step_impl(context, directory, duration):
     duration_seconds = humanfriendly.parse_timespan(duration)
-    assert check_condition_after_wait(condition=lambda: context.get_default_minifi_container().get_number_of_files(directory) < 1,
+    assert check_condition_after_wait(condition=lambda: context.get_default_minifi_container().get_number_of_files(directory) == 0,
                                       context=context, wait_time=duration_seconds)
 
 
-@then('there are {num_str} files in the "{directory}" directory in less than {duration}')
-@then('there is {num_str} file in the "{directory}" directory in less than {duration}')
-def step_impl(context: MinifiTestContext, num_str: str, directory: str, duration: str):
+@then('{num:d} files are placed in the "{directory}" directory in less than {duration}')
+@then('{num:d} file is placed in the "{directory}" directory in less than {duration}')
+def step_impl(context: MinifiTestContext, num: int, directory: str, duration: str):
     duration_seconds = humanfriendly.parse_timespan(duration)
-    if int(num_str) == 0:
+    if num == 0:
         context.execute_steps(f'then no files are placed in the "{directory}" directory in {duration} of running time')
         return
-    assert wait_for_condition(condition=lambda: context.get_default_minifi_container().get_number_of_files(directory) == int(num_str),
+    assert wait_for_condition(condition=lambda: context.get_default_minifi_container().get_number_of_files(directory) == num,
                               timeout_seconds=duration_seconds, bail_condition=lambda: context.get_default_minifi_container().exited,
                               context=context)
 
 
-@then('there are at least {num_str} files is in the "{directory}" directory in less than {duration}')
-def step_impl(context: MinifiTestContext, num_str: str, directory: str, duration: str):
+@then('at least {num:d} files are placed in the "{directory}" directory in less than {duration}')
+@then('at least {num:d} file is placed in the "{directory}" directory in less than {duration}')
+def step_impl(context: MinifiTestContext, num: int, directory: str, duration: str):
     duration_seconds = humanfriendly.parse_timespan(duration)
-    assert wait_for_condition(condition=lambda: context.get_default_minifi_container().get_number_of_files(directory) >= int(num_str),
+    assert wait_for_condition(condition=lambda: context.get_default_minifi_container().get_number_of_files(directory) >= num,
                               timeout_seconds=duration_seconds, bail_condition=lambda: context.get_default_minifi_container().exited,
                               context=context)
 
@@ -133,7 +134,7 @@ def step_impl(context: MinifiTestContext, directory: str, regex_str: str, durati
         timeout_seconds=duration_seconds, bail_condition=lambda: context.get_default_minifi_container().exited, context=context)
 
 
-@then('the contents of {directory} in less than {timeout} are: "{content_one}" and "{content_two}"')
+@then('files with contents "{content_one}" and "{content_two}" are placed in the "{directory}" directory in less than {timeout}')
 def step_impl(context: MinifiTestContext, directory: str, timeout: str, content_one: str, content_two: str):
     timeout_seconds = humanfriendly.parse_timespan(timeout)
     c1 = content_one.replace("\\n", "\n")
@@ -144,7 +145,7 @@ def step_impl(context: MinifiTestContext, directory: str, timeout: str, content_
                               context=context)
 
 
-@then('the contents of {directory} in less than {timeout} are: "{contents}"')
+@then('files with contents "{contents}" are placed in the "{directory}" directory in less than {timeout}')
 def step_impl(context: MinifiTestContext, directory: str, timeout: str, contents: str):
     timeout_seconds = humanfriendly.parse_timespan(timeout)
     new_contents = contents.replace("\\n", "\n")
@@ -173,7 +174,7 @@ def step_impl(context: MinifiTestContext, max_increase: str, duration: str):
     assert final_memory_usage - initial_memory_usage <= max_increase_in_bytes
 
 
-@then('after a wait of {duration}, at least {lower_bound:d} and at most {upper_bound:d} flowfiles are produced and placed in the "{directory}" directory')
+@then('after a wait of {duration}, at least {lower_bound:d} and at most {upper_bound:d} files are produced and placed in the "{directory}" directory')
 def step_impl(context, lower_bound, upper_bound, duration, directory):
     duration_seconds = humanfriendly.parse_timespan(duration)
     assert check_condition_after_wait(condition=lambda: context.get_default_minifi_container().get_number_of_files(directory) >= lower_bound

extensions/aws/tests/features/s3.feature

@@ -33,7 +33,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When both instances start up
 
-    Then there is a single file with "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" is placed in the "/tmp/output" directory in less than 20 seconds
     And the object on the s3 server is "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{"
     And the object content type on the s3 server is "application/octet-stream" and the object metadata matches use metadata
     And the Minifi logs contain the following message: "in a single upload" in less than 10 seconds
@@ -58,7 +58,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
     And the http proxy server is set up
     When all instances start up
 
-    Then there is a single file with "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" is placed in the "/tmp/output" directory in less than 20 seconds
     And the object on the s3 server is "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{"
     And the object content type on the s3 server is "application/octet-stream" and the object metadata matches use metadata
     And no errors were generated on the http-proxy regarding "http://s3-server-s3-1:9090/test_bucket/test_object_key"
@@ -81,7 +81,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When both instances start up
 
-    Then there is a single file with "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" is placed in the "/tmp/output" directory in less than 20 seconds
     And the object bucket on the s3 server is empty in less than 10 seconds
 
   Scenario: Deletion of a non-existent s3 object succeeds
@@ -96,7 +96,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When both instances start up
 
-    Then there is a single file with "test" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "test" is placed in the "/tmp/output" directory in less than 20 seconds
     And the object bucket on the s3 server is empty in less than 10 seconds
 
   Scenario: Deletion of a s3 object through a proxy-server succeeds
@@ -124,7 +124,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When all instances start up
 
-    Then there is a single file with "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "LH_O#L|FD<FASD{FO#@$#$%^ \"#\"$L%:\"@#$L\":test_data#$#%#$%?{\"F{" is placed in the "/tmp/output" directory in less than 20 seconds
     And the object bucket on the s3 server is empty in less than 10 seconds
     And no errors were generated on the http-proxy regarding "http://s3-server-s3-4:9090/test_bucket/test_object_key"
 
@@ -149,7 +149,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When all instances start up
 
-    Then there is a single file with "test" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "test" is placed in the "/tmp/output" directory in less than 20 seconds
 
   Scenario: A MiNiFi instance can download s3 bucket objects via a http-proxy
     Given a GetFile processor with the "Input Directory" property set to "/tmp/input"
@@ -176,7 +176,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When all instances start up
 
-    Then there is a single file with "test" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "test" is placed in the "/tmp/output" directory in less than 20 seconds
     And no errors were generated on the http-proxy regarding "http://s3-server-s3-6:9090/test_bucket/test_object_key"
 
   Scenario: A MiNiFi instance can list an S3 bucket directly
@@ -197,7 +197,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When all instances start up
 
-    Then there are 2 files in the "/tmp/output" directory in less than 20 seconds
+    Then 2 files are placed in the "/tmp/output" directory in less than 20 seconds
 
   Scenario: A MiNiFi instance can list an S3 bucket objects via a http-proxy
     Given a GetFile processor with the "Input Directory" property set to "/tmp/input"
@@ -220,7 +220,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When all instances start up
 
-    Then there is 1 file in the "/tmp/output" directory in less than 20 seconds
+    Then 1 file is placed in the "/tmp/output" directory in less than 20 seconds
     And no errors were generated on the http-proxy regarding "http://s3-server-s3-8:9090/test_bucket"
 
   Scenario: A MiNiFi instance transfers data in multiple parts to s3
@@ -236,7 +236,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
 
     When all instances start up
 
-    Then there is 1 file in the "/tmp/output" directory in less than 20 seconds
+    Then 1 file is placed in the "/tmp/output" directory in less than 20 seconds
     And the object on the s3 server is present and matches the original hash
     And the Minifi logs contain the following message: "passes the multipart threshold, uploading it in multiple parts" in less than 10 seconds
 
@@ -260,7 +260,7 @@ Feature: Sending data from MiNiFi-C++ to an AWS server
     And the http proxy server is set up
     When all instances start up
 
-    Then there is 1 file in the "/tmp/output" directory in less than 20 seconds
+    Then 1 file is placed in the "/tmp/output" directory in less than 20 seconds
     And the object on the s3 server is present and matches the original hash
     And the Minifi logs contain the following message: "passes the multipart threshold, uploading it in multiple parts" in less than 10 seconds
     And no errors were generated on the http-proxy regarding "http://s3-server-s3-10:9090/test_bucket/test_object_key"

extensions/azure/tests/features/azure_storage.feature

@@ -32,7 +32,7 @@ Feature: Sending data from MiNiFi-C++ to an Azure storage server
     And an Azure storage server is set up
     When the MiNiFi instance starts up
 
-    Then there is a single file with "#test_data$123$#" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "#test_data$123$#" is placed in the "/tmp/output" directory in less than 20 seconds
     And the object on the Azure storage server is "#test_data$123$#"
 
   Scenario: A MiNiFi instance can delete blob from Azure blob storage
@@ -90,7 +90,7 @@ Feature: Sending data from MiNiFi-C++ to an Azure storage server
     When the MiNiFi instance starts up
     And test blob "test" with the content "#test_data_123$#" is created on Azure blob storage
 
-    Then there is a single file with "data_" content in the "/tmp/output" directory in less than 20 seconds
+    Then a single file with the content "data_" is placed in the "/tmp/output" directory in less than 20 seconds
 
   Scenario: A MiNiFi instance can list a container on Azure blob storage
     Given a ListAzureBlobStorage processor set up to communicate with an Azure blob storage