From 20d13fd57cdd0c1eea911c451616e96fc7401c78 Mon Sep 17 00:00:00 2001 From: Angelique Jard Date: Fri, 10 Oct 2025 17:21:24 +0200 Subject: [PATCH 1/3] [test] allow env variable for opencti configuration in tests --- tests/conftest.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 364638db1..8b165bf1c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,15 +13,15 @@ @fixture(scope="session") def api_client(pytestconfig): if pytestconfig.getoption("--drone"): - return OpenCTIApiClient( - "http://opencti:4000", - "bfa014e0-e02e-4aa6-a42b-603b19dcf159", - ssl_verify=False, - ) + api_url = os.getenv("OPENCTI_API_URL", "http://opencti:4000") + api_token = os.getenv("OPENCTI_API_TOKEN", "bfa014e0-e02e-4aa6-a42b-603b19dcf159") else: - return OpenCTIApiClient( - "http://localhost:4000", - "d434ce02-e58e-4cac-8b4c-42bf16748e84", + api_url = os.getenv("OPENCTI_API_URL", "http://localhost:4000") + api_token = os.getenv("OPENCTI_API_TOKEN", "d434ce02-e58e-4cac-8b4c-42bf16748e84") + + return OpenCTIApiClient( + api_url, + api_token, ssl_verify=False, ) From 15f4596d5de173dcfdfe4b2497fccad2178062c4 Mon Sep 17 00:00:00 2001 From: Angelique Jard Date: Fri, 10 Oct 2025 17:23:45 +0200 Subject: [PATCH 2/3] Forgot the import --- tests/conftest.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 8b165bf1c..c4931df8f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ import pytest +import os from pytest_cases import fixture from pycti import ( @@ -14,16 +15,20 @@ def api_client(pytestconfig): if pytestconfig.getoption("--drone"): api_url = os.getenv("OPENCTI_API_URL", "http://opencti:4000") - api_token = os.getenv("OPENCTI_API_TOKEN", "bfa014e0-e02e-4aa6-a42b-603b19dcf159") + api_token = os.getenv( + "OPENCTI_API_TOKEN", "bfa014e0-e02e-4aa6-a42b-603b19dcf159" + ) else: api_url = os.getenv("OPENCTI_API_URL", "http://localhost:4000") - api_token = os.getenv("OPENCTI_API_TOKEN", "d434ce02-e58e-4cac-8b4c-42bf16748e84") + api_token = os.getenv( + "OPENCTI_API_TOKEN", "d434ce02-e58e-4cac-8b4c-42bf16748e84" + ) return OpenCTIApiClient( - api_url, - api_token, - ssl_verify=False, - ) + api_url, + api_token, + ssl_verify=False, + ) @fixture(scope="session") From fbea4b3751b7be5c1eb09d4ff5c7fec36912f096 Mon Sep 17 00:00:00 2001 From: Angelique Jard Date: Fri, 10 Oct 2025 17:25:01 +0200 Subject: [PATCH 3/3] Import order --- tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index c4931df8f..47dd4d58b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,6 @@ -import pytest import os + +import pytest from pytest_cases import fixture from pycti import (