Skip to content

QDB-16632 - Automatically detect whether encryption is enabled or not for the Python tests #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorniebylski merged 2 commits into from
May 7, 2025
Merged

QDB-16632 - Automatically detect whether encryption is enabled or not for the Python tests #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b6349
enable encryption based on env var
igorniebylski May 7, 2025
a949512
match behavior with start_services.sh
igorniebylski May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified scripts/teamcity/20.test.sh
100644 → 100755
View file
Open in desktop
Empty file.
6 changes: 4 additions & 2 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# pylint: disable=C0103,C0111,C0302,W0212
import os
import json
import random
import string
Expand Down Expand Up @@ -42,6 +43,7 @@ def _qdbd_settings():
"cluster_public_key": cluster_key,
"user_private_key_file": "../user_private.key",
"cluster_public_key_file": "../cluster_public.key",
"enable_encryption": os.environ.get("QDB_ENCRYPT_TRAFFIC", "0") != "0",
},
}

Expand Down Expand Up @@ -74,7 +76,7 @@ def qdbd_secure_connection(qdbd_settings):
user_name=qdbd_settings.get("security").get("user_name"),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)
conn.purge_all(datetime.timedelta(minutes=1))
yield conn
Expand All @@ -93,7 +95,7 @@ def qdbd_direct_connection(request):
user_name=settings.get("security").get("user_name"),
user_private_key=settings.get("security").get("user_private_key"),
cluster_public_key=settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=settings.get("security").get("enable_encryption"),
)


Expand Down
20 changes: 10 additions & 10 deletions tests/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def test_connect_throws_connection_error_when_no_cluster_public_key(qdbd_setting
uri=qdbd_settings.get("uri").get("secure"),
user_name=qdbd_settings.get("security").get("user_name"),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -31,7 +31,7 @@ def test_connect_throws_connection_error_when_no_user_name(qdbd_settings):
uri=qdbd_settings.get("uri").get("secure"),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -41,7 +41,7 @@ def test_connect_throws_connection_error_when_no_user_private_key(qdbd_settings)
uri=qdbd_settings.get("uri").get("secure"),
user_name=qdbd_settings.get("security").get("user_name"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -51,7 +51,7 @@ def test_connect_ok_to_secure_cluster(qdbd_settings):
user_name=qdbd_settings.get("security").get("user_name"),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -62,7 +62,7 @@ def test_connect_throws_connection_error_when_no_cluster_public_key_file(qdbd_se
user_security_file=qdbd_settings.get("security").get(
"user_private_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -73,7 +73,7 @@ def test_connect_throws_connection_error_when_no_user_security_file(qdbd_setting
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -87,7 +87,7 @@ def test_connect_throws_connection_error_when_mix_security_1(qdbd_settings):
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -103,7 +103,7 @@ def test_connect_throws_connection_error_when_mix_security_2(qdbd_settings):
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -120,7 +120,7 @@ def test_connect_throws_connection_error_when_mix_security_full(qdbd_settings):
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -131,7 +131,7 @@ def test_connect_ok_to_secure_cluster_with_file(qdbd_settings):
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand Down
20 changes: 10 additions & 10 deletions tests/test_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_node_connect_throws_connection_error_when_no_cluster_public_key(qdbd_se
uri=qdbd_settings.get("uri").get("secure").replace("qdb://", ""),
user_name=qdbd_settings.get("security").get("user_name"),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -26,7 +26,7 @@ def test_node_connect_throws_connection_error_when_no_user_name(qdbd_settings):
uri=qdbd_settings.get("uri").get("secure").replace("qdb://", ""),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -36,7 +36,7 @@ def test_node_connect_throws_connection_error_when_no_user_private_key(qdbd_sett
uri=qdbd_settings.get("uri").get("secure").replace("qdb://", ""),
user_name=qdbd_settings.get("security").get("user_name"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -46,7 +46,7 @@ def test_node_connect_ok_to_secure_cluster(qdbd_settings):
user_name=qdbd_settings.get("security").get("user_name"),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -59,7 +59,7 @@ def test_node_connect_throws_connection_error_when_no_cluster_public_key_file(
user_security_file=qdbd_settings.get("security").get(
"user_private_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -70,7 +70,7 @@ def test_node_connect_throws_connection_error_when_no_user_security_file(qdbd_se
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -84,7 +84,7 @@ def test_node_connect_throws_connection_error_when_mix_security_1(qdbd_settings)
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -100,7 +100,7 @@ def test_node_connect_throws_connection_error_when_mix_security_2(qdbd_settings)
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -117,7 +117,7 @@ def test_node_connect_throws_connection_error_when_mix_security_full(qdbd_settin
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand All @@ -128,7 +128,7 @@ def test_node_connect_ok_to_secure_cluster_with_file(qdbd_settings):
cluster_public_key_file=qdbd_settings.get("security").get(
"cluster_public_key_file"
),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
)


Expand Down
2 changes: 1 addition & 1 deletion tests/test_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def test_stats_of_node(qdbd_settings, qdbd_secure_connection, secure_table):
user_name=qdbd_settings.get("security").get("user_name"),
user_private_key=qdbd_settings.get("security").get("user_private_key"),
cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"),
enable_encryption=True,
enable_encryption=qdbd_settings.get("security").get("enable_encryption"),
Copy link

Copilot AI May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider defining a fixture or local variable to retrieve the encryption flag once, rather than repeating qdbd_settings.get("security").get("enable_encryption") in multiple tests.

Copilot uses AI. Check for mistakes.
)

qdbst.of_node(conn)
Expand Down