From d701e2cb623d6883357df411aa2186bf2d4795f0 Mon Sep 17 00:00:00 2001 From: Vladimir Domnich Date: Thu, 21 Jul 2022 19:05:34 +0400 Subject: [PATCH] Remove redundant environment variables Along with that few tweaks were made: - Increase wait time as it seems to take more time for complex object. - Increase timeout for create_bucket as it fails periodically. Signed-off-by: Vladimir Domnich --- pytest_tests/testsuites/object/test_object_api.py | 4 ++-- .../resources/lib/python_keywords/aws_cli_client.py | 2 +- robot/variables/common.py | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pytest_tests/testsuites/object/test_object_api.py b/pytest_tests/testsuites/object/test_object_api.py index 5134406a..91dffd53 100644 --- a/pytest_tests/testsuites/object/test_object_api.py +++ b/pytest_tests/testsuites/object/test_object_api.py @@ -101,7 +101,7 @@ def test_object_api(prepare_wallet_and_deposit, request, object_size): @pytest.mark.sanity @pytest.mark.grpc_api @pytest.mark.parametrize('object_size', [SIMPLE_OBJ_SIZE, COMPLEX_OBJ_SIZE], ids=['simple object', 'complex object']) -def test_object_api(prepare_wallet_and_deposit, request, object_size): +def test_object_api_lifetime(prepare_wallet_and_deposit, request, object_size): """ Test object deleted after expiration epoch. """ @@ -124,7 +124,7 @@ def test_object_api(prepare_wallet_and_deposit, request, object_size): # Wait for GC, because object with expiration is counted as alive until GC removes it with allure.step('Wait until GC completes on storage nodes'): - sleep(robot_time_to_int(SHARD_0_GC_SLEEP)) + sleep(1.5 * robot_time_to_int(SHARD_0_GC_SLEEP)) with allure.step('Check object deleted because it expires-on epoch'): with pytest.raises(Exception, match='.*object not found.*'): diff --git a/robot/resources/lib/python_keywords/aws_cli_client.py b/robot/resources/lib/python_keywords/aws_cli_client.py index 19a23ef4..4e0e4836 100644 --- a/robot/resources/lib/python_keywords/aws_cli_client.py +++ b/robot/resources/lib/python_keywords/aws_cli_client.py @@ -23,7 +23,7 @@ class AwsCliClient: def create_bucket(self, Bucket: str): cmd = f'aws --no-verify-ssl s3api create-bucket --bucket {Bucket} --endpoint-url {S3_GATE}' - _cmd_run(cmd) + _cmd_run(cmd, timeout=90) def list_buckets(self) -> dict: cmd = f'aws --no-verify-ssl s3api list-buckets --endpoint {S3_GATE}' diff --git a/robot/variables/common.py b/robot/variables/common.py index 28c808dc..56663578 100644 --- a/robot/variables/common.py +++ b/robot/variables/common.py @@ -81,12 +81,14 @@ NEOFS_NETMAP = [i['rpc'] for i in NEOFS_NETMAP_DICT.values()] NEOGO_EXECUTABLE = os.getenv('NEOGO_EXECUTABLE', 'neo-go') NEOFS_CLI_EXEC = os.getenv('NEOFS_CLI_EXEC', 'neofs-cli') -# Config of user's wallet that we use to run the tests +# Config of wallet with empty password. We use it for: +# - for wallet of user on behalf of whom we are running tests +# - for wallets of storage nodes WALLET_CONFIG = f"{CLI_CONFIGS_PATH}/empty_passwd.yml" MAINNET_WALLET_PATH = os.getenv("MAINNET_WALLET_PATH", f"{DEVENV_PATH}/services/chain/node-wallet.json") MAINNET_WALLET_CONFIG = os.getenv("MAINNET_WALLET_CONFIG", f"{CLI_CONFIGS_PATH}/one_wallet_password.yml") -MAINNET_SINGLE_ADDR = "NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP" +MAINNET_SINGLE_ADDR = os.getenv("MAINNET_SINGLE_ADDR", "NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP") MAINNET_WALLET_PASS = os.getenv("MAINNET_WALLET_PASS", "one") IR_WALLET_PATH = os.getenv("IR_WALLET_PATH", f"{DEVENV_PATH}/services/ir/wallet01.json") @@ -101,12 +103,8 @@ STORAGE_NODE_SSH_USER = os.getenv("STORAGE_NODE_SSH_USER") STORAGE_NODE_SSH_PASSWORD = os.getenv("STORAGE_NODE_SSH_PASSWORD") STORAGE_NODE_SSH_PRIVATE_KEY_PATH = os.getenv("STORAGE_NODE_SSH_PRIVATE_KEY_PATH") -# Parameters that control resources located on the storage node: -# STORAGE_NODE_BIN_PATH - path to directory that contains CLI tools -# STORAGE_NODE_CONFIG_PATH - configuration file for neofs-cli on the storage node +# Path to directory with CLI binaries on storage node (currently we need only neofs-cli) STORAGE_NODE_BIN_PATH = os.getenv("STORAGE_NODE_BIN_PATH", f"{DEVENV_PATH}/vendor") -STORAGE_NODE_CONFIG_PATH = os.getenv("STORAGE_NODE_CONFIG_PATH", f"{DEVENV_PATH}/services/storage/cli-cfg.yml") -STORAGE_NODE_WALLET_PATH = os.getenv("STORAGE_NODE_WALLET_PATH") # allows to override path to wallet that was given in STORAGE_NODE_CONFIG_PATH, this is temp parameter, should be fixed in environment setup # Path and config for neofs-adm utility. Optional if tests are running against devenv NEOFS_ADM_EXEC = os.getenv("NEOFS_ADM_EXEC")