0ddbf8cafa
* updated files with docstrings to pass pylint Signed-off-by: Mark Cohen <markcoh@amazon.com> * updated samples to prepare for enabling missing-docstring linter; will continue to work on this before committing setup.cfg Signed-off-by: Mark Cohen <markcoh@amazon.com> * removed missing-function-docstring from setup.cfg so the linter doesn't fail while work on docstrings continues Signed-off-by: Mark Cohen <markcoh@amazon.com> * corrected unnecessary return docstring values Signed-off-by: Mark Cohen <markcoh@amazon.com> * fixing failure in 'black' on reformatting Signed-off-by: Mark Cohen <markcoh@amazon.com> * updated utils to pass missing-function-docstring tests Signed-off-by: Mark Cohen <markcoh@amazon.com> * 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 <markcoh@amazon.com> * * 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 <markcoh@amazon.com> * 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 <markcoh@amazon.com> * removed pylint ignore missing-function-docstring Signed-off-by: Mark Cohen <markcoh@amazon.com> * added pylint.extensions.docparams plugin updated some docstrings to correct parameters removed pylint from setup.cfg Signed-off-by: Mark Cohen <markcoh@amazon.com> * added four lints for opensearchpy/ Signed-off-by: Mark Cohen <markcoh@amazon.com> * adding await back to client.info() call Signed-off-by: Mark Cohen <markcoh@amazon.com> * 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 <markcoh@amazon.com> --------- Signed-off-by: Mark Cohen <markcoh@amazon.com>
126 lines
3.7 KiB
Python
126 lines
3.7 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.
|
|
#
|
|
# Licensed to Elasticsearch B.V. under one or more contributor
|
|
# license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright
|
|
# ownership. Elasticsearch B.V. licenses this file to you under
|
|
# the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import re
|
|
from datetime import datetime
|
|
from typing import Any
|
|
|
|
from pytest import fixture
|
|
|
|
from opensearchpy.connection.connections import add_connection
|
|
from opensearchpy.helpers import bulk
|
|
from opensearchpy.helpers.test import get_test_client
|
|
|
|
from .test_data import (
|
|
DATA,
|
|
FLAT_DATA,
|
|
TEST_GIT_DATA,
|
|
create_flat_git_index,
|
|
create_git_index,
|
|
)
|
|
from .test_document import Comment, History, PullRequest, User
|
|
|
|
|
|
@fixture(scope="session") # type: ignore
|
|
def client() -> Any:
|
|
client = get_test_client(verify_certs=False, http_auth=("admin", "admin"))
|
|
add_connection("default", client)
|
|
return client
|
|
|
|
|
|
@fixture(scope="session") # type: ignore
|
|
def opensearch_version(client: Any) -> Any:
|
|
"""
|
|
yields a major version from the client
|
|
:param client: client to connect to opensearch
|
|
"""
|
|
info: Any = client.info()
|
|
print(info)
|
|
yield (int(x) for x in match_version(info))
|
|
|
|
|
|
def match_version(info: Any) -> Any:
|
|
"""
|
|
matches the major version from the given client info
|
|
:param info: part of the response from OpenSearch
|
|
"""
|
|
match = re.match(r"^([0-9.]+)", info["version"]["number"])
|
|
assert match is not None
|
|
yield match.group(1).split(".")
|
|
|
|
|
|
@fixture # type: ignore
|
|
def write_client(client: Any) -> Any:
|
|
yield client
|
|
client.indices.delete("test-*", ignore=404)
|
|
client.indices.delete_template("test-template", ignore=404)
|
|
|
|
|
|
@fixture(scope="session") # type: ignore
|
|
def data_client(client: Any) -> Any:
|
|
# create mappings
|
|
create_git_index(client, "git")
|
|
create_flat_git_index(client, "flat-git")
|
|
# load data
|
|
bulk(client, DATA, raise_on_error=True, refresh=True)
|
|
bulk(client, FLAT_DATA, raise_on_error=True, refresh=True)
|
|
yield client
|
|
client.indices.delete("git", ignore=404)
|
|
client.indices.delete("flat-git", ignore=404)
|
|
|
|
|
|
@fixture # type: ignore
|
|
def pull_request(write_client: Any) -> Any:
|
|
PullRequest.init()
|
|
pr = PullRequest(
|
|
_id=42,
|
|
comments=[
|
|
Comment(
|
|
content="Hello World!",
|
|
author=User(name="honzakral"),
|
|
created_at=datetime(2018, 1, 9, 10, 17, 3, 21184),
|
|
history=[
|
|
History(
|
|
timestamp=datetime(2012, 1, 1),
|
|
diff="-Ahoj Svete!\n+Hello World!",
|
|
)
|
|
],
|
|
),
|
|
],
|
|
created_at=datetime(2018, 1, 9, 9, 17, 3, 21184),
|
|
)
|
|
pr.save(refresh=True)
|
|
return pr
|
|
|
|
|
|
@fixture # type: ignore
|
|
def setup_ubq_tests(client: Any) -> str:
|
|
# todo what's a ubq test?
|
|
index = "test-git"
|
|
create_git_index(client, index)
|
|
bulk(client, TEST_GIT_DATA, raise_on_error=True, refresh=True)
|
|
return index
|