MINIFICPP-2697 Upgrade m2crypto to the latest version

Plus, some minor improvements to the help string of the test runner scripts.

Author: fgerlits

behave_framework/pyproject.toml

@@ -8,7 +8,7 @@ dependencies = [
     "docker==7.1.0",
     "PyYAML==6.0.3",
     "humanfriendly==10.0",
-    "m2crypto==0.41.0",
+    "m2crypto==0.46.2",
     "pyopenssl==25.0.0",
     "pyjks==20.0.0"
 ]

docker/DockerVerify.sh

@@ -35,10 +35,10 @@ print_help()
   printf '%s\n' "Runs the provided behave tests in a containerized environment"
   printf 'Usage: %s [--image-tag-prefix <arg>] [-h|--help] <minifi_version> <feature_path-1> [<feature_path-2>] ... [<feature_path-n>] ...\n' "$0"
   printf '\t%s\n' "<minifi_version>: the version of minifi"
-  printf '\t%s\n' "<tags_to_run>: include these tags"
-  printf '\t%s\n' "--tags_to_exclude: optional tags that should be skipped (no default)"
-  printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (no default)"
-  printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously. (default: 3)"
+  printf '\t%s\n' "<tags_to_run>: comma-separated list of tags to include, e.g: CORE,ENABLE_KAFKA,ENABLE_SPLUNK"
+  printf '\t%s\n' "--tags_to_exclude: optional comma-separated list of tags that should be skipped (default: none)"
+  printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (default: none)"
+  printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously (default: 3)"
   printf '\t%s\n' "--fips: enables FIPS mode by default"
   printf '\t%s\n' "-h, --help: Prints help"
 }

docker/RunBehaveTests.sh

@@ -35,10 +35,10 @@ print_help()
   printf '%s\n' "Runs the provided behave tests in a containerized environment"
   printf 'Usage: %s [--image-tag-prefix <arg>] [-h|--help] <minifi_version> <tags_to_run> ...\n' "$0"
   printf '\t%s\n' "<minifi_version>: the version of minifi"
-  printf '\t%s\n' "<tags_to_run>: include these tags"
-  printf '\t%s\n' "--tags_to_exclude: optional tags that should be skipped (no default)"
-  printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (no default)"
-  printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously. (default: 3)"
+  printf '\t%s\n' "<tags_to_run>: comma-separated list of tags to include, e.g: CORE,ENABLE_KAFKA,ENABLE_SPLUNK"
+  printf '\t%s\n' "--tags_to_exclude: optional comma-separated list of tags that should be skipped (default: none)"
+  printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (default: none)"
+  printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously (default: 3)"
   printf '\t%s\n' "--fips: enables FIPS mode by default"
   printf '\t%s\n' "-h, --help: Prints help"
 }

docker/requirements.txt

@@ -3,7 +3,7 @@ shortuuid==1.0.13
 behavex==4.1.0
 docker==7.1.0
 PyYAML==6.0.2
-m2crypto==0.41.0
+m2crypto==0.46.2
 watchdog==6.0.0
 pyopenssl==25.0.0
 azure-storage-blob==12.24.1