Merge pull request 'import fix for some helpers and steps' (#12) from EliChin/fix/import into master

Reviewed-on: TrueCloudLab/frostfs-testcases#12

pytest_tests/helpers/container.py

@@ -8,12 +8,12 @@ import allure
 from frostfs_testlib.cli import FrostfsCli
 from frostfs_testlib.shell import Shell
 from frostfs_testlib.utils import json_utils
-from wallet import WalletFile
 
 from pytest_tests.helpers.cluster import Cluster
 from pytest_tests.helpers.file_helper import generate_file, get_file_hash
 from pytest_tests.helpers.frostfs_verbs import put_object, put_object_to_random_node
 from pytest_tests.helpers.storage_object_info import StorageObjectInfo
+from pytest_tests.helpers.wallet import WalletFile
 from pytest_tests.resources.common import FROSTFS_CLI_EXEC, WALLET_CONFIG
 
 logger = logging.getLogger("NeoLogger")

pytest_tests/helpers/epoch.py

@@ -6,9 +6,9 @@ import allure
 from frostfs_testlib.cli import FrostfsAdm, FrostfsCli, NeoGo
 from frostfs_testlib.shell import Shell
 from frostfs_testlib.utils import datetime_utils, wallet_utils
-from payment_neogo import get_contract_hash
 
 from pytest_tests.helpers.cluster import Cluster, StorageNode
+from pytest_tests.helpers.payment_neogo import get_contract_hash
 from pytest_tests.helpers.test_control import wait_for_success
 from pytest_tests.resources.common import (
     FROSTFS_ADM_CONFIG_PATH,

pytest_tests/helpers/http_gate.py

@@ -10,9 +10,9 @@ from urllib.parse import quote_plus
 
 import allure
 import requests
-from aws_cli_client import LONG_TIMEOUT
 from frostfs_testlib.shell import Shell
 
+from pytest_tests.helpers.aws_cli_client import LONG_TIMEOUT
 from pytest_tests.helpers.cli_helpers import _cmd_run
 from pytest_tests.helpers.cluster import StorageNode
 from pytest_tests.helpers.file_helper import get_file_hash

pytest_tests/helpers/k6.py

@@ -6,7 +6,8 @@ from typing import Optional
 
 import allure
 from frostfs_testlib.shell import Shell
-from remote_process import RemoteProcess
+
+from pytest_tests.helpers.remote_process import RemoteProcess
 
 EXIT_RESULT_CODE = 0
 LOAD_RESULTS_PATTERNS = {

pytest_tests/steps/s3_gate_base.py

@@ -8,14 +8,14 @@ from typing import Any, Optional
 import allure
 import boto3
 import pytest
-import s3_gate_bucket
-import s3_gate_object
 import urllib3
 from botocore.config import Config
 from botocore.exceptions import ClientError
 from frostfs_testlib.shell import Shell
 from pytest import FixtureRequest
 
+from pytest_tests.steps import s3_gate_bucket
+from pytest_tests.steps import s3_gate_object
 from pytest_tests.helpers.aws_cli_client import AwsCliClient
 from pytest_tests.helpers.cli_helpers import _cmd_run, _configure_aws_cli, _run_with_passwd
 from pytest_tests.helpers.cluster import Cluster

pytest_tests/steps/s3_gate_object.py

@@ -8,10 +8,10 @@ import allure
 import pytest
 import urllib3
 from botocore.exceptions import ClientError
-from s3_gate_bucket import S3_SYNC_WAIT_TIME
 
 from pytest_tests.helpers.aws_cli_client import AwsCliClient
 from pytest_tests.helpers.cli_helpers import log_command_execution
+from pytest_tests.steps.s3_gate_bucket import S3_SYNC_WAIT_TIME
 
 ##########################################################
 # Disabling warnings on self-signed certificate which the