actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Re-enable integration tests across multiple versions of OpenSearch (#163)

Browse Source 
* Re-enable integration tests for 1.x versions of OpenSearch

Signed-off-by: Vacha Shah <[email protected]>

* Fixing integ tests after re-enabling 1.x versions

Signed-off-by: Vacha Shah <[email protected]>

* Separating out versions

Signed-off-by: Vacha Shah <[email protected]>
This commit is contained in:
Vacha Shah
2022-05-03 09:27:25 -07:00
committed by GitHub
parent 262f05ad02
commit 3944cc2928
3 changed files with 24 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/integration.yml
+13 -6
View File
@@ -11,13 +11,20 @@ jobs:
matrix: matrix:
cluster: ["opensearch"] cluster: ["opensearch"]
secured: ["true", "false"] secured: ["true", "false"]
opensearch_version: [""] entry:
- { opensearch_version: 1.0.0 }
- { opensearch_version: 1.0.1 }
- { opensearch_version: 1.1.0 }
- { opensearch_version: 1.2.0 }
- { opensearch_version: 1.2.1 }
- { opensearch_version: 1.2.2 }
- { opensearch_version: 1.2.3 }
- { opensearch_version: 1.2.4 }
- { opensearch_version: 1.3.0 }
- { opensearch_version: 1.3.1 }
steps: steps:
- name: Checkout - name: Checkout
if: ${{ matrix.opensearch_version != ''}}
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Integ ${{ matrix.cluster }} secured=${{ matrix.secured }} version=${{matrix.entry.opensearch_version}}
- name: Integ ${{ matrix.cluster }} secured=${{ matrix.secured }} version=${{matrix.opensearch_version}} run: "./.ci/run-tests ${{ matrix.cluster }} ${{ matrix.secured }} ${{ matrix.entry.opensearch_version }}"
if: ${{ matrix.opensearch_version != ''}}
run: "./.ci/run-tests ${{ matrix.cluster }} ${{ matrix.secured }} ${{ matrix.opensearch_version }}"
test_opensearchpy/test_async/test_server/test_helpers.py
+4 -21
View File
@@ -872,28 +872,11 @@ class TestParentChildReindex:
): ):
await helpers.async_reindex(async_client, "test-index", "real-index") await helpers.async_reindex(async_client, "test-index", "real-index")
q = await async_client.get(index="real-index", id=42) assert {"question_answer": "question"} == (
assert { await async_client.get(index="real-index", id=42)
"_id": "42", )["_source"]
"_index": "real-index",
"_primary_term": 1,
"_seq_no": 0,
"_source": {"question_answer": "question"},
"_version": 1,
"found": True,
} == q
q = await async_client.get(index="test-index", id=47, routing=42)
assert { assert {
"_routing": "42",
"_id": "47",
"_index": "test-index",
"_primary_term": 1,
"_seq_no": 1,
"_source": {
"some": "data", "some": "data",
"question_answer": {"name": "answer", "parent": 42}, "question_answer": {"name": "answer", "parent": 42},
}, } == (await async_client.get(index="test-index", id=47, routing=42))["_source"]
"_version": 1,
"found": True,
} == q
test_opensearchpy/test_server/test_helpers.py
+5 -26
View File
@@ -738,33 +738,12 @@ class TestParentChildReindex(OpenSearchTestCase):
def test_children_are_reindexed_correctly(self): def test_children_are_reindexed_correctly(self):
helpers.reindex(self.client, "test-index", "real-index") helpers.reindex(self.client, "test-index", "real-index")
q = self.client.get(index="real-index", id=42)
self.assertEqual( self.assertEqual(
{ {"question_answer": "question"},
"_id": "42", self.client.get(index="real-index", id=42)["_source"],
"_index": "real-index",
"_primary_term": 1,
"_seq_no": 0,
"_source": {"question_answer": "question"},
"_version": 1,
"found": True,
},
q,
) )
q = self.client.get(index="test-index", id=47, routing=42)
self.assertEqual( self.assertEqual(
{ {"some": "data", "question_answer": {"name": "answer", "parent": 42}},
"_routing": "42", self.client.get(index="test-index", id=47, routing=42)["_source"],
"_id": "47",
"_index": "test-index",
"_primary_term": 1,
"_seq_no": 1,
"_source": {
"some": "data",
"question_answer": {"name": "answer", "parent": 42},
},
"_version": 1,
"found": True,
},
q,
) )