martinzink commented on code in PR #2237:
URL: https://github.com/apache/nifi-minifi-cpp/pull/2237#discussion_r3843393402
##########
extensions/sql/tests/features/environment.py:
##########
@@ -16,35 +16,40 @@
#
import os
-import docker
from textwrap import dedent
from containers.postgress_server_container import PostgresContainer
from minifi_behave.containers.docker_image_builder import DockerImageBuilder
-from minifi_behave.core.hooks import common_before_scenario
-from minifi_behave.core.hooks import common_after_scenario
-from minifi_behave.core.hooks import get_minifi_container_image
+from minifi_behave.core.hooks import (
+ common_after_scenario,
+ common_before_scenario,
+ get_minifi_container_image,
+)
+
+import docker
# These hooks are executed by behave before and after each scenario
# The common_before_scenario and common_after_scenario must be called for
proper setup and tear down
def before_all(context):
- minifi_tag_prefix = os.environ['MINIFI_TAG_PREFIX'] if 'MINIFI_TAG_PREFIX'
in os.environ else ''
+ minifi_tag_prefix = os.environ.get("MINIFI_TAG_PREFIX", "")
if "rocky" in minifi_tag_prefix:
install_sql_cmd = "dnf -y install postgresql-odbc"
so_location = "psqlodbca.so"
- elif "bullseye" in minifi_tag_prefix or "bookworm" in minifi_tag_prefix or
"trixie" in minifi_tag_prefix:
- install_sql_cmd = "apt -y install odbc-postgresql"
- so_location = "/usr/lib/$(gcc -dumpmachine)/odbc/psqlodbca.so"
- elif "jammy" in minifi_tag_prefix or "noble" in minifi_tag_prefix:
+ elif (
+ ("bullseye" in minifi_tag_prefix or "bookworm" in minifi_tag_prefix or
"trixie" in minifi_tag_prefix)
+ or "jammy" in minifi_tag_prefix
+ or "noble" in minifi_tag_prefix
+ ):
Review Comment:
[review
change](https://github.com/apache/nifi-minifi-cpp/pull/2237/commits/a0acca0604129563fa6b42f4af67c1e05cb5491b)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
