adapt tests to new ordered insertMany failures for tables, data api PR #2193 (#387)

* adapt tests to the change in ordered insertMany failures for tables, data api PR #2193

* bump hcd IT data api version, remove useless imgpull step

* set prod-Astra int.tests to use legacy insertMany failuremodes

---------

Co-authored-by: Stefano Lottini <236640031+sl-at-ibm@users.noreply.github.com>

Author: hemidactylus

.github/workflows/local.yaml

@@ -18,7 +18,6 @@ env:
   AWS_ECR_ROLE_NAME: ${{ secrets.AWS_ECR_ROLE_NAME }}
   AWS_ECR_REPOSITORY: ${{ secrets.AWS_ECR_REPOSITORY }}
   AWS_ECR_REGISTRY: ${{ secrets.AWS_ECR_REGISTRY }}
-  AWS_ECR_HCD_IMAGE_TAG: "1.2.1-early-preview"
 
 jobs:
   test:
@@ -54,10 +53,6 @@ jobs:
     - name: Login to Amazon ECR
       uses: aws-actions/amazon-ecr-login@v2
 
-    - name: Pull the image
-      run: |
-        docker pull $AWS_ECR_REGISTRY/$AWS_ECR_REPOSITORY:$AWS_ECR_HCD_IMAGE_TAG
-
     - name: Run pytest
       run: |
         uv run pytest tests/base/integration

.github/workflows/main.yml

@@ -15,6 +15,7 @@ jobs:
       ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }}
       ASTRA_DB_API_ENDPOINT: ${{ secrets.ASTRA_DB_API_ENDPOINT }}
       HEADER_EMBEDDING_API_KEY_OPENAI: ${{ secrets.HEADER_EMBEDDING_API_KEY_OPENAI }}
+      LEGACY_INSERTMANY_BEHAVIOUR_PRE2193: "yes"
     runs-on: ubuntu-latest
 
     steps:

CHANGES

@@ -9,7 +9,8 @@ Event Observer API, to listen to events:
     - events are: warnings, payloads/responses, ...
     - useful for customized logging, observability and instrumentation;
     - see `astrapy.event_observers` module and docstring of classes therein for more.
-mainteinance: enabled text-index integration tests on Astra
+maintenance: introduce `LEGACY_INSERTMANY_BEHAVIOUR_PRE2193` flag to control related tests
+maintenance: enabled text-index integration tests on Astra
 maintenance: introduced the publish-and-release workflow machinery
 maintenance: split development/maintenance from user README
 maintenance. Improvement in testing machinery:

DEVELOPING.md

@@ -170,6 +170,10 @@ certain environment variables, otherwise the associated tests are excluded from
 Prepend tests with a `ASTRAPY_TEST_LATEST_MAIN=y` for features found on `main` that are not released anywhere.
 _(Tip: run a code search first to see what is currently marked as such. Chances are nothing is.)_
 
+### Legacy ordered-insert-many behaviour
+
+Generally, [PR 2193](https://github.com/stargate/data-api/pull/2193) is included in modern Data API versions. In case tests are run to Data API 1.0.32 or lower, run the tests with the following additional environment variable to adjust the test expectations: `LEGACY_INSERTMANY_BEHAVIOUR_PRE2193="yes"`.
+
 ## Publish-and-release
 
 Releasing a new version happens through the Github `release` workflow, which includes all necessary testing

tests/base/integration/tables/test_table_dml_async.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+import os
 from typing import Any, Iterable, Sequence, cast
 
 import pytest
@@ -399,7 +400,10 @@ def _assert_tim_exceptions(exps: Sequence[Exception], count: int) -> None:
             await async_table_simple.insert_many(
                 SIMPLE_SEVEN_ROWS_F2, ordered=True, chunk_size=2
             )
-        await _assert_consistency([], exc.value)
+        if "LEGACY_INSERTMANY_BEHAVIOUR_PRE2193" not in os.environ:
+            await _assert_consistency(["p1"], exc.value)
+        else:
+            await _assert_consistency([], exc.value)
         _assert_tim_exceptions(exc.value.exceptions, count=1)
 
         # ordered, failing later batch
@@ -408,7 +412,10 @@ def _assert_tim_exceptions(exps: Sequence[Exception], count: int) -> None:
             await async_table_simple.insert_many(
                 SIMPLE_SEVEN_ROWS_F4, ordered=True, chunk_size=2
             )
-        await _assert_consistency(["p1", "p2"], exc.value)
+        if "LEGACY_INSERTMANY_BEHAVIOUR_PRE2193" not in os.environ:
+            await _assert_consistency(["p1", "p2", "p3"], exc.value)
+        else:
+            await _assert_consistency(["p1", "p2"], exc.value)
         _assert_tim_exceptions(exc.value.exceptions, count=1)
 
         # unordered/concurrency=1, good rows
@@ -537,7 +544,6 @@ async def test_table_insert_many_failures_async(
         assert err3.inserted_id_tuples == []
 
         # ordered insertion [good, bad, good_skipped]
-        # Tables do not insert anything in this case! (as opposed to Collections)
         err4: TableInsertManyException | None = None
         try:
             await async_table_simple.insert_many(
@@ -550,7 +556,10 @@ async def test_table_insert_many_failures_async(
         assert len(err4.exceptions) == 1
         assert isinstance(err4.exceptions[0], DataAPIResponseException)
         assert len(err4.exceptions[0].error_descriptors) == 1
-        assert err4.inserted_id_tuples == []
+        if "LEGACY_INSERTMANY_BEHAVIOUR_PRE2193" not in os.environ:
+            assert err4.inserted_id_tuples == [("n0",)]
+        else:
+            assert err4.inserted_id_tuples == []
 
     @pytest.mark.describe("test of table update_one, async")
     async def test_table_update_one_async(

tests/base/integration/tables/test_table_dml_sync.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+import os
 from typing import Any, Iterable, Sequence, cast
 
 import pytest
@@ -381,7 +382,10 @@ def _assert_tim_exceptions(exps: Sequence[Exception], count: int) -> None:
             sync_table_simple.insert_many(
                 SIMPLE_SEVEN_ROWS_F2, ordered=True, chunk_size=2
             )
-        _assert_consistency([], exc.value)
+        if "LEGACY_INSERTMANY_BEHAVIOUR_PRE2193" not in os.environ:
+            _assert_consistency(["p1"], exc.value)
+        else:
+            _assert_consistency([], exc.value)
         _assert_tim_exceptions(exc.value.exceptions, count=1)
 
         # ordered, failing later batch
@@ -390,7 +394,10 @@ def _assert_tim_exceptions(exps: Sequence[Exception], count: int) -> None:
             sync_table_simple.insert_many(
                 SIMPLE_SEVEN_ROWS_F4, ordered=True, chunk_size=2
             )
-        _assert_consistency(["p1", "p2"], exc.value)
+        if "LEGACY_INSERTMANY_BEHAVIOUR_PRE2193" not in os.environ:
+            _assert_consistency(["p1", "p2", "p3"], exc.value)
+        else:
+            _assert_consistency(["p1", "p2"], exc.value)
         _assert_tim_exceptions(exc.value.exceptions, count=1)
 
         # unordered/concurrency=1, good rows
@@ -517,7 +524,6 @@ def test_table_insert_many_failures_sync(
         assert err3.inserted_id_tuples == []
 
         # ordered insertion [good, bad, good_skipped]
-        # Tables do not insert anything in this case! (as opposed to Collections)
         err4: TableInsertManyException | None = None
         try:
             sync_table_simple.insert_many(
@@ -530,7 +536,10 @@ def test_table_insert_many_failures_sync(
         assert len(err4.exceptions) == 1
         assert isinstance(err4.exceptions[0], DataAPIResponseException)
         assert len(err4.exceptions[0].error_descriptors) == 1
-        assert err4.inserted_id_tuples == []
+        if "LEGACY_INSERTMANY_BEHAVIOUR_PRE2193" not in os.environ:
+            assert err4.inserted_id_tuples == [("n0",)]
+        else:
+            assert err4.inserted_id_tuples == []
 
     @pytest.mark.describe("test of table update_one, sync")
     def test_table_update_one_sync(

tests/hcd_compose/docker-compose.yml

@@ -21,7 +21,7 @@ services:
       retries: 20
 
   data-api:
-    image: stargateio/data-api:v1.0.32
+    image: stargateio/data-api:v1.0.34
     depends_on:
       hcd:
         condition: service_healthy