From bbf9ea714314dad645dec31120dc2a23ee67898d Mon Sep 17 00:00:00 2001 From: Andrey Berezin Date: Wed, 3 May 2023 16:23:05 +0300 Subject: [PATCH] Use proper name for binary Signed-off-by: Andrey Berezin --- README.md | 4 ++-- pytest_tests/helpers/binary_version.py | 16 +++++++++++----- pytest_tests/resources/common.py | 2 +- pytest_tests/steps/load.py | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b0d6273..0143503 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ These tests rely on resources and utility modules that have been originally deve - `make` - `sudo cp bin/frostfs-cli /usr/local/bin/frostfs-cli` -2. Install frostfs-authmate +2. Install frostfs-s3-authmate - `git clone git@github.com:TrueCloudLab/frostfs-s3-gw.git` - `cd frostfs-s3-gw` - `make` - - `sudo cp bin/frostfs-s3-authmate /usr/local/bin/frostfs-authmate` + - `sudo cp bin/frostfs-s3-authmate /usr/local/bin/frostfs-s3-authmate` 3. Install neo-go - `git clone git@github.com:nspcc-dev/neo-go.git` diff --git a/pytest_tests/helpers/binary_version.py b/pytest_tests/helpers/binary_version.py index 485f794..e784d2f 100644 --- a/pytest_tests/helpers/binary_version.py +++ b/pytest_tests/helpers/binary_version.py @@ -5,7 +5,13 @@ from frostfs_testlib.cli import FrostfsAdm, FrostfsCli from frostfs_testlib.hosting import Hosting from frostfs_testlib.shell import Shell -from pytest_tests.resources.common import FROSTFS_ADM_EXEC, FROSTFS_CLI_EXEC, WALLET_CONFIG +from pytest_tests.resources.common import ( + FROSTFS_ADM_EXEC, + FROSTFS_AUTHMATE_EXEC, + FROSTFS_CLI_EXEC, + NEOGO_EXECUTABLE, + WALLET_CONFIG, +) logger = logging.getLogger("NeoLogger") @@ -13,18 +19,18 @@ logger = logging.getLogger("NeoLogger") def get_local_binaries_versions(shell: Shell) -> dict[str, str]: versions = {} - for binary in ["neo-go", "frostfs-authmate"]: + for binary in [NEOGO_EXECUTABLE, FROSTFS_AUTHMATE_EXEC]: out = shell.exec(f"{binary} --version").stdout versions[binary] = _parse_version(out) frostfs_cli = FrostfsCli(shell, FROSTFS_CLI_EXEC, WALLET_CONFIG) - versions["frostfs-cli"] = _parse_version(frostfs_cli.version.get().stdout) + versions[FROSTFS_CLI_EXEC] = _parse_version(frostfs_cli.version.get().stdout) try: frostfs_adm = FrostfsAdm(shell, FROSTFS_ADM_EXEC) - versions["frostfs-adm"] = _parse_version(frostfs_adm.version.get().stdout) + versions[FROSTFS_ADM_EXEC] = _parse_version(frostfs_adm.version.get().stdout) except RuntimeError: - logger.info(f"frostfs-adm not installed") + logger.info("frostfs-adm not installed") out = shell.exec("aws --version").stdout out_lines = out.split("\n") diff --git a/pytest_tests/resources/common.py b/pytest_tests/resources/common.py index da0187a..e5a0737 100644 --- a/pytest_tests/resources/common.py +++ b/pytest_tests/resources/common.py @@ -33,7 +33,7 @@ WALLET_PASS = os.getenv("WALLET_PASS", "") # Paths to CLI executables on machine that runs tests NEOGO_EXECUTABLE = os.getenv("NEOGO_EXECUTABLE", "neo-go") FROSTFS_CLI_EXEC = os.getenv("FROSTFS_CLI_EXEC", "frostfs-cli") -FROSTFS_AUTHMATE_EXEC = os.getenv("FROSTFS_AUTHMATE_EXEC", "frostfs-authmate") +FROSTFS_AUTHMATE_EXEC = os.getenv("FROSTFS_AUTHMATE_EXEC", "frostfs-s3-authmate") FROSTFS_ADM_EXEC = os.getenv("FROSTFS_ADM_EXEC", "frostfs-adm") # Config for frostfs-adm utility. Optional if tests are running against devenv diff --git a/pytest_tests/steps/load.py b/pytest_tests/steps/load.py index 668692d..3951e6a 100644 --- a/pytest_tests/steps/load.py +++ b/pytest_tests/steps/load.py @@ -12,7 +12,7 @@ from frostfs_testlib.shell.interfaces import InteractiveInput from pytest_tests.helpers.k6 import K6, LoadParams, LoadResults from pytest_tests.resources.common import STORAGE_NODE_SERVICE_NAME_REGEX -FROSTFS_AUTHMATE_PATH = "frostfs-authmate" +FROSTFS_AUTHMATE_PATH = "frostfs-s3-authmate" STOPPED_HOSTS = []