Skip to content

Commit 6155f87

Browse files
committed
Merge branch 'fix/update-test-configuration' into align/align-idgen-random
2 parents 84d94c3 + 279c5d5 commit 6155f87

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

terminusdb_client/tests/integration_tests/conftest.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
MAX_CONTAINER_STARTUP_TIME = 120 # Increased from 30 to 120 seconds for slower systems
99

10+
1011
# Check if a local TerminusDB test server is already running
1112
def is_local_server_running():
1213
"""Check if local TerminusDB server is running at http://127.0.0.1:6363"""
@@ -69,13 +70,13 @@ def docker_url_jwt(pytestconfig):
6970
# we are using subprocess in case we need to access some of the outputs
7071
# most likely
7172
jwt_token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InRlc3RrZXkifQ.eyJodHRwOi8vdGVybWludXNkYi5jb20vc2NoZW1hL3N5c3RlbSNhZ2VudF9uYW1lIjoiYWRtaW4iLCJodHRwOi8vdGVybWludXNkYi5jb20vc2NoZW1hL3N5c3RlbSN1c2VyX2lkZW50aWZpZXIiOiJhZG1pbkB1c2VyLmNvbSIsImlzcyI6Imh0dHBzOi8vdGVybWludXNodWIuZXUuYXV0aDAuY29tLyIsInN1YiI6ImFkbWluIiwiYXVkIjpbImh0dHBzOi8vdGVybWludXNodWIvcmVnaXN0ZXJVc2VyIiwiaHR0cHM6Ly90ZXJtaW51c2h1Yi5ldS5hdXRoMC5jb20vdXNlcmluZm8iXSwiaWF0IjoxNTkzNzY5MTgzLCJhenAiOiJNSkpuZEdwMHpVZE03bzNQT1RRUG1SSkltWTJobzBhaSIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwifQ.Ru03Bi6vSIQ57bC41n6fClSdxlb61m0xX6Q34Yh91gql0_CyfYRWTuqzqPMFoCefe53hPC5E-eoSFdID_u6w1ih_pH-lTTqus9OWgi07Qou3QNs8UZBLiM4pgLqcBKs0N058jfg4y6h9GjIBGVhX9Ni2ez3JGNcz1_U45BhnreE"
72-
73+
7374
# Check if JWT server is already running (port 6367)
7475
if is_jwt_server_running():
7576
print("\n✓ Using existing JWT Docker TerminusDB server at http://127.0.0.1:6367")
7677
yield ("http://127.0.0.1:6367", jwt_token)
7778
return # Don't clean up - server was already running
78-
79+
7980
pytestconfig.getoption("docker_compose")
8081
output = subprocess.run(
8182
[
@@ -138,7 +139,7 @@ def docker_url(pytestconfig):
138139
"""
139140
Provides a TerminusDB server URL for integration tests.
140141
Prefers local test server if running, otherwise starts Docker container.
141-
142+
142143
NOTE: This fixture returns just the URL. Tests expect AUTOLOGIN mode (no authentication).
143144
If using local server with authentication, use TERMINUSDB_AUTOLOGIN=true when starting it.
144145
"""
@@ -149,13 +150,13 @@ def docker_url(pytestconfig):
149150
print(" Or use: TERMINUSDB_SERVER_AUTOLOGIN=true ./tests/terminusdb-test-server.sh restart")
150151
yield "http://127.0.0.1:6363"
151152
return # Don't clean up - server was already running
152-
153+
153154
# Check if Docker container is already running (port 6366)
154155
if is_docker_server_running():
155156
print("\n✓ Using existing Docker TerminusDB server at http://127.0.0.1:6366")
156157
yield "http://127.0.0.1:6366"
157158
return # Don't clean up - server was already running
158-
159+
159160
# No server found, start Docker container
160161
print("\n⚠ No server found, starting Docker container with AUTOLOGIN...")
161162
pytestconfig.getoption("docker_compose")

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ passenv = TERMINUSX_TOKEN
2727
[flake8]
2828
# S501 is turned off for now, check if the verify=false for request is ok
2929
ignore = E501,W503,S101,S310,A003,E203,S607,S603,S404,W391,N814,N804,S106,F722,S105,E266,S311,N806
30-
exclude = .*/,__pycache__,docs/,build/
30+
exclude = .*/,__pycache__,docs/,build/,venv/,.tox/

0 commit comments

Comments
 (0)