From 694c31330e0f019d51b43e9c0502233fecdfa3e0 Mon Sep 17 00:00:00 2001 From: anastasia prasolova <anastasia@nspcc.ru> Date: Fri, 3 Sep 2021 14:51:57 +0300 Subject: [PATCH] updated readme; misprints fixed Signed-off-by: anastasia prasolova <anastasia@nspcc.ru> --- README.md | 54 ++++++++++++------- robot/resources/lib/gates.py | 6 +-- .../acl/common_steps_acl_basic.robot | 12 ++--- .../integration/services/http_gate.robot | 9 ++-- 4 files changed, 48 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index be9406cf..48d50548 100644 --- a/README.md +++ b/README.md @@ -6,43 +6,59 @@ - `git clone git@github.com:nspcc-dev/neofs-node.git` - `cd neofs-node` - `make` - - `sudo cp bin/neofs-cli /usr/local/bin/neofs-cli`, add alias path to - bin/neofs-cli or run `export NEOFS_EXECUTABLE=<path_to_binary>` + - `sudo cp bin/neofs-cli /usr/local/bin/neofs-cli` - or download binary from releases: https://github.com/nspcc-dev/neofs-node/releases - -2. Install cdn-authmate - - `git clone git@github.com:nspcc-dev/cdn-authmate.git` - - `cd cdn-authmate` - - `make build` - - `sudo cp bin/cdn-authmate /usr/local/bin/cdn-authmate`, add alias path to - bin/cdn-authmate or run `export CDNAUTH_EXEC=<path_to_binary>` +2. Install neofs-authmate + - `git clone git@github.com:nspcc-dev/neofs-s3-gw.git` + - `cd neofs-s3-gw` + - `make` + - `sudo cp bin/neofs-authmate /usr/local/bin/neofs-authmate` 3. Install neo-go - `git clone git@github.com:nspcc-dev/neo-go.git` - `cd neo-go` - `git checkout v0.92.0` (or the current version in the neofs-dev-env) - `make` - - `sudo cp bin/neo-go /usr/local/bin/neo-go`, add alias path to bin/neo-go - or run `export NEOGO_EXECUTABLE=<path_to_binary>` - + - `sudo cp bin/neo-go /usr/local/bin/neo-go` or download binary from releases: https://github.com/nspcc-dev/neo-go/releases 4. Install Testcases dependencies - - `pip3 install -r requirements.txt` + - `pip3.8 install -r requirements.txt` - `make deps` -(replace pip3 with the appropriate python package manager on the system). - -Test cases are designed to run on Python 3.7+ +Test cases are designed to run on Python 3.8. ### Run 0. Add keywords repo to PYTHONPATH `export PYTHONPATH=${PYTHONPATH}:~/neofs-keywords/lib::~/neofs-keywords/robot` -1. Execute the command `make run` +1. Clone neofs-dev-env and prepare it -2. Logs will be available in the artifacts/ directory after tests with any of the statuses are completed. +``` +# clean up obsolete volumes +make down +# restart +make clean +make up +# decrease maximum object size to 1000 bytes +make update.max_object_size val=1000 +``` +Also disable Storage Nodes Morph cache + +``` +export NEOFS_MORPH_DISABLE_CACHE=true +``` + +2. Export neofs-dev-env variables into the shell where you are going to run tests + +``` +cd neofs-dev-env +export `make env` +``` + +3. Execute the command `make run` + +4. Logs will be available in the artifacts/ directory after tests with any of the statuses are completed. ### Running an arbitrary test case diff --git a/robot/resources/lib/gates.py b/robot/resources/lib/gates.py index cf04f329..a497d5e7 100644 --- a/robot/resources/lib/gates.py +++ b/robot/resources/lib/gates.py @@ -1,15 +1,13 @@ #!/usr/bin/python3.8 -import logging +import boto3 import os +import pexpect import re import requests import shutil import subprocess -import boto3 import uuid -import io -import pexpect from robot.api.deco import keyword from robot.api import logger diff --git a/robot/testsuites/integration/acl/common_steps_acl_basic.robot b/robot/testsuites/integration/acl/common_steps_acl_basic.robot index 8397be19..c87b13b8 100644 --- a/robot/testsuites/integration/acl/common_steps_acl_basic.robot +++ b/robot/testsuites/integration/acl/common_steps_acl_basic.robot @@ -9,18 +9,18 @@ ${CONTAINER_WAIT_INTERVAL} = 1 min Create Containers Log Create Private Container - ${PRIV_CID_GEN} = Create container ${USER_KEY} ${PRIVATE_ACL} ${COMMON_PLACEMENT_RULE} - Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} + ${PRIV_CID_GEN} = Create container ${USER_KEY} ${PRIVATE_ACL} ${COMMON_PLACEMENT_RULE} + Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} ... Container Existing ${USER_KEY} ${PRIV_CID_GEN} Log Create Public Container - ${PUBLIC_CID_GEN} = Create container ${USER_KEY} ${PUBLIC_ACL} ${COMMON_PLACEMENT_RULE} - Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} + ${PUBLIC_CID_GEN} = Create container ${USER_KEY} ${PUBLIC_ACL} ${COMMON_PLACEMENT_RULE} + Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} ... Container Existing ${USER_KEY} ${PUBLIC_CID_GEN} Log Create Read-Only Container - ${READONLY_CID_GEN} = Create container ${USER_KEY} ${READONLY_ACL} ${COMMON_PLACEMENT_RULE} - Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} + ${READONLY_CID_GEN} = Create container ${USER_KEY} ${READONLY_ACL} ${COMMON_PLACEMENT_RULE} + Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} ... Container Existing ${USER_KEY} ${READONLY_CID_GEN} Set Global Variable ${PRIV_CID} ${PRIV_CID_GEN} diff --git a/robot/testsuites/integration/services/http_gate.robot b/robot/testsuites/integration/services/http_gate.robot index 73782393..541144f5 100644 --- a/robot/testsuites/integration/services/http_gate.robot +++ b/robot/testsuites/integration/services/http_gate.robot @@ -13,6 +13,7 @@ Resource ../${RESOURCES}/setup_teardown.robot ${PLACEMENT_RULE} = REP 1 IN X CBF 1 SELECT 1 FROM * AS X ${TRANSFER_AMOUNT} = ${6} ${DEPOSIT_AMOUNT} = ${5} +${CONTAINER_WAIT_INTERVAL} = 1 min *** Test cases *** @@ -28,14 +29,14 @@ NeoFS HTTP Gateway ... Transaction accepted in block ${TX} ${MAINNET_BALANCE} = Get Mainnet Balance ${ADDR} - Should Be Equal As Numbers ${MAINNET_BALANCE} ${TRANSFER_AMOUNT} + Should Be Equal As Numbers ${MAINNET_BALANCE} ${TRANSFER_AMOUNT} - ${TX_DEPOSIT} = NeoFS Deposit ${WIF} ${DEPOSIT_AMOUNT} + ${TX_DEPOSIT} = NeoFS Deposit ${WIF} ${DEPOSIT_AMOUNT} Wait Until Keyword Succeeds ${MAINNET_TIMEOUT} ${MAINNET_BLOCK_TIME} ... Transaction accepted in block ${TX_DEPOSIT} - ${CID} = Create container ${WIF} 0x0FFFFFFF ${PLACEMENT_RULE} - Wait Until Keyword Succeeds 2 min 30 sec + ${CID} = Create container ${WIF} 0x0FFFFFFF ${PLACEMENT_RULE} + Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} ... Container Existing ${WIF} ${CID} ${FILE} = Generate file of bytes ${SIMPLE_OBJ_SIZE}