Mark CohenandGitHub
0ddbf8cafa
* updated files with docstrings to pass pylint Signed-off-by: Mark Cohen <[email protected]> * updated samples to prepare for enabling missing-docstring linter; will continue to work on this before committing setup.cfg Signed-off-by: Mark Cohen <[email protected]> * removed missing-function-docstring from setup.cfg so the linter doesn't fail while work on docstrings continues Signed-off-by: Mark Cohen <[email protected]> * corrected unnecessary return docstring values Signed-off-by: Mark Cohen <[email protected]> * fixing failure in 'black' on reformatting Signed-off-by: Mark Cohen <[email protected]> * updated utils to pass missing-function-docstring tests Signed-off-by: Mark Cohen <[email protected]> * updated functions with missing docstrings or pylint ignore instructions; added a utility to automatically add these ignore instructions to most functions that should be self-describing; rolled back some automatically generated code mistakenly changed Signed-off-by: Mark Cohen <[email protected]> * * ignoring opensearchpy for pylint and then added it back to noxfile.py * fixed some lints; created a feature flag for newer dynamic pylint so now lints can be fixed first in legacy code and then enabled by multiple people * extracted a method for per-folder linting * updated noxfile.lint_per_folder with type hints * enabled unspecified-encoding in pylint * added disable missing-function-docstring pragma to test_clients.py in test_async and test_server * added more encodings to pass unspecified-encoding pylint tests * updated changelog Signed-off-by: Mark Cohen <[email protected]> * updated CHANGELOG.md entry removed the feature flag for pylint lint_per_folder fixed failures from mypy and pylint removed pylint MESSAGE CONTROL config from setup.cfg after relocating to lint_per_folder method Signed-off-by: Mark Cohen <[email protected]> * removed pylint ignore missing-function-docstring Signed-off-by: Mark Cohen <[email protected]> * added pylint.extensions.docparams plugin updated some docstrings to correct parameters removed pylint from setup.cfg Signed-off-by: Mark Cohen <[email protected]> * added four lints for opensearchpy/ Signed-off-by: Mark Cohen <[email protected]> * adding await back to client.info() call Signed-off-by: Mark Cohen <[email protected]> * updated TODOs as requested renamed test_opensearchpy.test_async.test_server.test_helpers.conftest.setup_ubq_tests to setup_update_by_query_tests added OpenSearch-main/rest-api-spec/src/main/resources/rest-api-spec/test/indices/stats/50_noop_update[0] to skip tests list run_tests.py catches a CalledProcessError when the git repo already exists and the command to add the origin fails in fetch_opensearch_repo() Signed-off-by: Mark Cohen <[email protected]> --------- Signed-off-by: Mark Cohen <[email protected]>
235 lines
9.0 KiB
Python
235 lines
9.0 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
# The OpenSearch Contributors require contributions made to
|
|
# this file be licensed under the Apache-2.0 license or a
|
|
# compatible open source license.
|
|
#
|
|
# Modifications Copyright OpenSearch Contributors. See
|
|
# GitHub history for details.
|
|
|
|
|
|
from typing import Any
|
|
|
|
import pytest
|
|
from _pytest.mark.structures import MarkDecorator
|
|
from mock import Mock
|
|
from pytest import fixture
|
|
|
|
from opensearchpy.connection.async_connections import add_connection, async_connections
|
|
|
|
pytestmark: MarkDecorator = pytest.mark.asyncio
|
|
|
|
|
|
@fixture # type: ignore
|
|
async def mock_client(dummy_response: Any) -> Any:
|
|
"""
|
|
yields a mock client with the dummy_response param
|
|
:param dummy_response: any kind of response for test
|
|
"""
|
|
client = Mock()
|
|
client.search.return_value = dummy_response
|
|
await add_connection("mock", client)
|
|
yield client
|
|
async_connections._conns = {}
|
|
async_connections._kwargs = {}
|
|
|
|
|
|
@fixture # type: ignore
|
|
def dummy_response() -> Any:
|
|
return {
|
|
"_shards": {"failed": 0, "successful": 10, "total": 10},
|
|
"hits": {
|
|
"hits": [
|
|
{
|
|
"_index": "test-index",
|
|
"_id": "opensearch",
|
|
"_score": 12.0,
|
|
"_source": {"city": "Amsterdam", "name": "OpenSearch"},
|
|
},
|
|
{
|
|
"_index": "test-index",
|
|
"_id": "42",
|
|
"_score": 11.123,
|
|
"_routing": "opensearch",
|
|
"_source": {
|
|
"name": {"first": "Shay", "last": "Bannon"},
|
|
"lang": "java",
|
|
"twitter": "kimchy",
|
|
},
|
|
},
|
|
{
|
|
"_index": "test-index",
|
|
"_id": "47",
|
|
"_score": 1,
|
|
"_routing": "opensearch",
|
|
"_source": {
|
|
"name": {"first": "Honza", "last": "Král"},
|
|
"lang": "python",
|
|
"twitter": "honzakral",
|
|
},
|
|
},
|
|
{
|
|
"_index": "test-index",
|
|
"_id": "53",
|
|
"_score": 16.0,
|
|
"_routing": "opensearch",
|
|
},
|
|
],
|
|
"max_score": 12.0,
|
|
"total": 123,
|
|
},
|
|
"timed_out": False,
|
|
"took": 123,
|
|
}
|
|
|
|
|
|
@fixture # type: ignore
|
|
def aggs_search() -> Any:
|
|
from opensearchpy._async.helpers.search import AsyncSearch
|
|
|
|
s = AsyncSearch(index="flat-git")
|
|
s.aggs.bucket("popular_files", "terms", field="files", size=2).metric(
|
|
"line_stats", "stats", field="stats.lines"
|
|
).metric("top_commits", "top_hits", size=2, _source=["stats.*", "committed_date"])
|
|
s.aggs.bucket(
|
|
"per_month", "date_histogram", interval="month", field="info.committed_date"
|
|
)
|
|
s.aggs.metric("sum_lines", "sum", field="stats.lines")
|
|
return s
|
|
|
|
|
|
@fixture # type: ignore
|
|
def aggs_data() -> Any:
|
|
return {
|
|
"took": 4,
|
|
"timed_out": False,
|
|
"_shards": {"total": 1, "successful": 1, "failed": 0},
|
|
"hits": {"total": 52, "hits": [], "max_score": 0.0},
|
|
"aggregations": {
|
|
"sum_lines": {"value": 25052.0},
|
|
"per_month": {
|
|
"buckets": [
|
|
{
|
|
"doc_count": 38,
|
|
"key": 1393632000000,
|
|
"key_as_string": "2014-03-01T00:00:00.000Z",
|
|
},
|
|
{
|
|
"doc_count": 11,
|
|
"key": 1396310400000,
|
|
"key_as_string": "2014-04-01T00:00:00.000Z",
|
|
},
|
|
{
|
|
"doc_count": 3,
|
|
"key": 1398902400000,
|
|
"key_as_string": "2014-05-01T00:00:00.000Z",
|
|
},
|
|
]
|
|
},
|
|
"popular_files": {
|
|
"buckets": [
|
|
{
|
|
"key": "opensearchpy",
|
|
"line_stats": {
|
|
"count": 40,
|
|
"max": 228.0,
|
|
"min": 2.0,
|
|
"sum": 2151.0,
|
|
"avg": 53.775,
|
|
},
|
|
"doc_count": 40,
|
|
"top_commits": {
|
|
"hits": {
|
|
"total": 40,
|
|
"hits": [
|
|
{
|
|
"_id": "3ca6e1e73a071a705b4babd2f581c91a2a3e5037",
|
|
"_type": "doc",
|
|
"_source": {
|
|
"stats": {
|
|
"files": 4,
|
|
"deletions": 7,
|
|
"lines": 30,
|
|
"insertions": 23,
|
|
},
|
|
"committed_date": "2014-05-02T13:47:19",
|
|
},
|
|
"_score": 1.0,
|
|
"_index": "flat-git",
|
|
},
|
|
{
|
|
"_id": "eb3e543323f189fd7b698e66295427204fff5755",
|
|
"_type": "doc",
|
|
"_source": {
|
|
"stats": {
|
|
"files": 1,
|
|
"deletions": 0,
|
|
"lines": 18,
|
|
"insertions": 18,
|
|
},
|
|
"committed_date": "2014-05-01T13:32:14",
|
|
},
|
|
"_score": 1.0,
|
|
"_index": "flat-git",
|
|
},
|
|
],
|
|
"max_score": 1.0,
|
|
}
|
|
},
|
|
},
|
|
{
|
|
"key": "test_opensearchpy/test_dsl",
|
|
"line_stats": {
|
|
"count": 35,
|
|
"max": 228.0,
|
|
"min": 2.0,
|
|
"sum": 1939.0,
|
|
"avg": 55.4,
|
|
},
|
|
"doc_count": 35,
|
|
"top_commits": {
|
|
"hits": {
|
|
"total": 35,
|
|
"hits": [
|
|
{
|
|
"_id": "3ca6e1e73a071a705b4babd2f581c91a2a3e5037",
|
|
"_type": "doc",
|
|
"_source": {
|
|
"stats": {
|
|
"files": 4,
|
|
"deletions": 7,
|
|
"lines": 30,
|
|
"insertions": 23,
|
|
},
|
|
"committed_date": "2014-05-02T13:47:19",
|
|
},
|
|
"_score": 1.0,
|
|
"_index": "flat-git",
|
|
},
|
|
{
|
|
"_id": "dd15b6ba17dd9ba16363a51f85b31f66f1fb1157",
|
|
"_type": "doc",
|
|
"_source": {
|
|
"stats": {
|
|
"files": 3,
|
|
"deletions": 18,
|
|
"lines": 62,
|
|
"insertions": 44,
|
|
},
|
|
"committed_date": "2014-05-01T13:30:44",
|
|
},
|
|
"_score": 1.0,
|
|
"_index": "flat-git",
|
|
},
|
|
],
|
|
"max_score": 1.0,
|
|
}
|
|
},
|
|
},
|
|
],
|
|
"doc_count_error_upper_bound": 0,
|
|
"sum_other_doc_count": 120,
|
|
},
|
|
},
|
|
}
|