Small updates for store tests

Author: strawgate

key-value/key-value-aio/src/key_value/aio/stores/elasticsearch/store.py

@@ -270,6 +270,8 @@ async def _setup_collection(self, *, collection: str) -> None:
         except BadRequestError as e:
             if "index_already_exists_exception" in str(e).lower():
                 return
+            if "resource_already_exists_exception" in str(e).lower():
+                return
             raise
 
     def _get_index_name(self, collection: str) -> str:

key-value/key-value-aio/tests/stores/elasticsearch/test_elasticsearch.py

@@ -23,7 +23,7 @@
 ES_HOST = "localhost"
 ES_PORT = 9200
 ES_URL = f"http://{ES_HOST}:{ES_PORT}"
-ES_CONTAINER_PORT = 9200
+ES_CONTAINER_PORT = 19200
 
 WAIT_FOR_ELASTICSEARCH_TIMEOUT = 30
 

key-value/key-value-aio/tests/stores/opensearch/test_opensearch.py

@@ -25,7 +25,7 @@
 LOCALHOST = "localhost"
 
 CONTAINER_PORT = 9200
-HOST_PORT = 19200
+HOST_PORT = 19201
 
 OPENSEARCH_URL = f"http://{LOCALHOST}:{HOST_PORT}"
 

key-value/key-value-sync/src/key_value/sync/code_gen/stores/elasticsearch/store.py

@@ -242,6 +242,8 @@ def _setup_collection(self, *, collection: str) -> None:
         except BadRequestError as e:
             if "index_already_exists_exception" in str(e).lower():
                 return
+            if "resource_already_exists_exception" in str(e).lower():
+                return
             raise
 
     def _get_index_name(self, collection: str) -> str:

key-value/key-value-sync/tests/code_gen/stores/elasticsearch/test_elasticsearch.py

@@ -26,7 +26,7 @@
 ES_HOST = "localhost"
 ES_PORT = 9200
 ES_URL = f"http://{ES_HOST}:{ES_PORT}"
-ES_CONTAINER_PORT = 9200
+ES_CONTAINER_PORT = 19200
 
 WAIT_FOR_ELASTICSEARCH_TIMEOUT = 30
 # Released Apr 2025

key-value/key-value-sync/tests/code_gen/stores/opensearch/test_opensearch.py

@@ -28,7 +28,7 @@
 LOCALHOST = "localhost"
 
 CONTAINER_PORT = 9200
-HOST_PORT = 19200
+HOST_PORT = 19201
 
 OPENSEARCH_URL = f"http://{LOCALHOST}:{HOST_PORT}"