From e7ad675151ae27d1455f384fd93d47e31b74b2e4 Mon Sep 17 00:00:00 2001 From: Nikita Furin Date: Fri, 27 Dec 2024 15:06:10 +0000 Subject: [PATCH 1/3] Fixed test client initialization in fetching to ensure tests run locally Signed-off-by: Nikita Furin --- test_opensearchpy/run_tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test_opensearchpy/run_tests.py b/test_opensearchpy/run_tests.py index a9f01b7b4..cda626fa1 100755 --- a/test_opensearchpy/run_tests.py +++ b/test_opensearchpy/run_tests.py @@ -68,7 +68,10 @@ def fetch_opensearch_repo() -> None: # find out the sha of the running client try: - client = get_client() + client = get_client( + verify_certs=False, + http_auth=("admin", environ.get("OPENSEARCH_PASSWORD", "admin")) + ) sha = client.info()["version"]["build_hash"] except (SkipTest, KeyError): print("No running opensearch >1.X server...") From 942a8b62058c4a2a20f852b8a72afc4dd551aefe Mon Sep 17 00:00:00 2001 From: Nikita Furin Date: Fri, 27 Dec 2024 15:23:19 +0000 Subject: [PATCH 2/3] Fixed code style, append CHANGELOG Signed-off-by: Nikita Furin --- CHANGELOG.md | 1 + test_opensearchpy/run_tests.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f62a96695..871d5101a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Deprecated ### Removed ### Fixed +- Fixed test client initialization to ensure tests run locally ([879](https://github.com/opensearch-project/opensearch-py/pull/879)) ### Security ## [2.8.0] diff --git a/test_opensearchpy/run_tests.py b/test_opensearchpy/run_tests.py index cda626fa1..77222d3af 100755 --- a/test_opensearchpy/run_tests.py +++ b/test_opensearchpy/run_tests.py @@ -70,7 +70,7 @@ def fetch_opensearch_repo() -> None: try: client = get_client( verify_certs=False, - http_auth=("admin", environ.get("OPENSEARCH_PASSWORD", "admin")) + http_auth=("admin", environ.get("OPENSEARCH_PASSWORD", "admin")), ) sha = client.info()["version"]["build_hash"] except (SkipTest, KeyError): From da6d388db4f54b22317a1e579c33c156ce709943 Mon Sep 17 00:00:00 2001 From: Nikita Furin Date: Tue, 31 Dec 2024 13:05:42 +0000 Subject: [PATCH 3/3] Maybe getting the real password fix integration tests Signed-off-by: Nikita Furin --- test_opensearchpy/run_tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test_opensearchpy/run_tests.py b/test_opensearchpy/run_tests.py index 77222d3af..c3b9e52d2 100755 --- a/test_opensearchpy/run_tests.py +++ b/test_opensearchpy/run_tests.py @@ -68,9 +68,12 @@ def fetch_opensearch_repo() -> None: # find out the sha of the running client try: + password = environ.get("OPENSEARCH_INITIAL_ADMIN_PASSWORD") + if password is None: + password = environ.get("OPENSEARCH_PASSWORD", "admin") client = get_client( verify_certs=False, - http_auth=("admin", environ.get("OPENSEARCH_PASSWORD", "admin")), + http_auth=("admin", password), ) sha = client.info()["version"]["build_hash"] except (SkipTest, KeyError):