changed pythonpath for virtualenv; shortened test libraries imports

Signed-off-by: anastasia prasolova <anastasia@nspcc.ru>
This commit is contained in:
anastasia prasolova 2021-09-27 23:41:21 +03:00 committed by Anastasia Prasolova
parent 51e3e52f62
commit 54835b5ee5
13 changed files with 47 additions and 46 deletions

View file

@ -7,8 +7,8 @@ Library payment_neogo.py
Library acl.py Library acl.py
Resource common_steps_acl_extended.robot Resource common_steps_acl_extended.robot
Resource ../${RESOURCES}/payment_operations.robot Resource payment_operations.robot
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
Resource ../../../variables/eacl_tables.robot Resource ../../../variables/eacl_tables.robot
*** Test cases *** *** Test cases ***
@ -19,7 +19,7 @@ Extended ACL Operations
[Setup] Setup [Setup] Setup
${WALLET} ${ADDR} ${USER_KEY} = Prepare Wallet And Deposit ${WALLET} ${ADDR} ${USER_KEY} = Prepare Wallet And Deposit
Log Check extended ACL with simple object Log Check extended ACL with simple object
Generate files ${SIMPLE_OBJ_SIZE} Generate files ${SIMPLE_OBJ_SIZE}

View file

@ -1,6 +1,8 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library acl.py
*** Variables *** *** Variables ***
${FILE_USR_HEADER} = key1=1,key2=abc ${FILE_USR_HEADER} = key1=1,key2=abc
${FILE_USR_HEADER_DEL} = key1=del,key2=del ${FILE_USR_HEADER_DEL} = key1=del,key2=del
@ -20,7 +22,7 @@ Create Container Public
Generate files Generate files
[Arguments] ${SIZE} [Arguments] ${SIZE}
${FILE_S_GEN_1} = Generate file of bytes ${SIZE} ${FILE_S_GEN_1} = Generate file of bytes ${SIZE}
${FILE_S_GEN_2} = Generate file of bytes ${SIZE} ${FILE_S_GEN_2} = Generate file of bytes ${SIZE}
Set Global Variable ${FILE_S} ${FILE_S_GEN_1} Set Global Variable ${FILE_S} ${FILE_S_GEN_1}

View file

@ -1,12 +1,12 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../../variables/common.py
Library Collections Library Collections
Library Process Library Process
Library String Library String
Library ${KEYWORDS}/contract_keywords.py Library contract_keywords.py
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
*** Variables *** *** Variables ***
${SN_01_ADDR} = s01.neofs.devenv:8080 ${SN_01_ADDR} = s01.neofs.devenv:8080

View file

@ -2,12 +2,12 @@
Variables ../../../variables/common.py Variables ../../../variables/common.py
Variables ../../../variables/acl.py Variables ../../../variables/acl.py
Library ../${RESOURCES}/neofs.py Library neofs.py
Library ../${RESOURCES}/payment_neogo.py Library payment_neogo.py
Library ${KEYWORDS}/wallet_keywords.py Library wallet_keywords.py
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
Resource ../${RESOURCES}/payment_operations.robot Resource payment_operations.robot
*** Variables *** *** Variables ***
${CONTAINER_WAIT_INTERVAL} = 1 min ${CONTAINER_WAIT_INTERVAL} = 1 min

View file

@ -1,10 +1,10 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library ../${RESOURCES}/neofs.py Library neofs.py
Library ../${RESOURCES}/payment_neogo.py Library payment_neogo.py
Library ${KEYWORDS}/wallet_keywords.py Library wallet_keywords.py
Library ${KEYWORDS}/rpc_call_keywords.py Library rpc_call_keywords.py
Resource ../${RESOURCES}/payment_operations.robot Resource ../${RESOURCES}/payment_operations.robot
Resource ../${RESOURCES}/setup_teardown.robot Resource ../${RESOURCES}/setup_teardown.robot

View file

@ -1,8 +1,8 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library ${KEYWORDS}/wallet_keywords.py Library wallet_keywords.py
Library ${KEYWORDS}/rpc_call_keywords.py Library rpc_call_keywords.py
*** Variables *** *** Variables ***
${FILE_USR_HEADER} = key1=1,key2=abc ${FILE_USR_HEADER} = key1=1,key2=abc

View file

@ -1,13 +1,13 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library ../${RESOURCES}/neofs.py Library neofs.py
Library ../${RESOURCES}/payment_neogo.py Library payment_neogo.py
Library ${KEYWORDS}/contract_keywords.py Library contract_keywords.py
Resource common_steps_object.robot Resource common_steps_object.robot
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
Resource ../${RESOURCES}/payment_operations.robot Resource payment_operations.robot
*** Variables *** *** Variables ***
${CLEANUP_TIMEOUT} = 10s ${CLEANUP_TIMEOUT} = 10s

View file

@ -1,13 +1,13 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library ../${RESOURCES}/neofs.py Library neofs.py
Library ../${RESOURCES}/payment_neogo.py Library payment_neogo.py
Library ${KEYWORDS}/contract_keywords.py Library contract_keywords.py
Resource common_steps_object.robot Resource common_steps_object.robot
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
Resource ../${RESOURCES}/payment_operations.robot Resource payment_operations.robot
*** Variables *** *** Variables ***
${CLEANUP_TIMEOUT} = 10s ${CLEANUP_TIMEOUT} = 10s

View file

@ -1,13 +1,13 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library ../${RESOURCES}/neofs.py Library neofs.py
Library ../${RESOURCES}/payment_neogo.py Library payment_neogo.py
Library ${KEYWORDS}/contract_keywords.py Library contract_keywords.py
Resource common_steps_object.robot Resource common_steps_object.robot
Resource ../${RESOURCES}/payment_operations.robot Resource payment_operations.robot
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
*** Variables *** *** Variables ***
${CLEANUP_TIMEOUT} = 10s ${CLEANUP_TIMEOUT} = 10s

View file

@ -1,12 +1,12 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library ../${RESOURCES}/neofs.py Library neofs.py
Library ../${RESOURCES}/payment_neogo.py Library payment_neogo.py
Library ${KEYWORDS}/wallet_keywords.py Library wallet_keywords.py
Library ${KEYWORDS}/rpc_call_keywords.py Library rpc_call_keywords.py
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
*** Variables *** *** Variables ***
${DEPOSIT_AMOUNT} = ${10} ${DEPOSIT_AMOUNT} = ${10}

View file

@ -1,13 +1,13 @@
*** Settings *** *** Settings ***
Variables ../../../variables/common.py Variables ../../../variables/common.py
Library ../${RESOURCES}/neofs.py Library neofs.py
Library ../${RESOURCES}/payment_neogo.py Library payment_neogo.py
Library ../${RESOURCES}/gates.py Library gates.py
Library ${KEYWORDS}/wallet_keywords.py Library wallet_keywords.py
Library ${KEYWORDS}/rpc_call_keywords.py Library rpc_call_keywords.py
Resource ../${RESOURCES}/setup_teardown.robot Resource setup_teardown.robot
*** Variables *** *** Variables ***
${PLACEMENT_RULE} = REP 1 IN X CBF 1 SELECT 1 FROM * AS X ${PLACEMENT_RULE} = REP 1 IN X CBF 1 SELECT 1 FROM * AS X

View file

@ -4,7 +4,6 @@ ROOT='../..'
RESOURCES="%s/resources/lib" % ROOT RESOURCES="%s/resources/lib" % ROOT
CERT="%s/../../ca" % ROOT CERT="%s/../../ca" % ROOT
KEYWORDS="%s/../../../neofs-keywords/robot/" % ROOT
# Common NeoFS variables can be declared from neofs-dev-env env variables. # Common NeoFS variables can be declared from neofs-dev-env env variables.
# High priority is accepted for those envs. # High priority is accepted for those envs.

View file

@ -4,4 +4,4 @@ pushd ../neofs-dev-env
export `make env` export `make env`
popd popd
export PYTHONPATH=${PYTHONPATH}:${VIRTUAL_ENV}/neofs-keywords/lib:${VIRTUAL_ENV}/neofs-keywords/robot:~/neofs-testcases/robot/resources/lib export PYTHONPATH=${PYTHONPATH}:${VIRTUAL_ENV}/neofs-keywords/lib:${VIRTUAL_ENV}/neofs-keywords/robot:${VIRTUAL_ENV}/../robot/resources/lib