Improve import of general tests/cli stuff as per rigel

This commit is contained in:
Ethan Frey 2017-09-04 16:22:27 +02:00
parent 96f96ffc3d
commit 23a539ae6f
10 changed files with 10 additions and 27 deletions

View File

@ -116,9 +116,7 @@ test03CreditTx() {
# Load common then run these tests with shunit2! # Load common then run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/common.sh . $CLI_DIR/common.sh
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -353,9 +353,7 @@ assertNewHeight() {
# Load common then run these tests with shunit2! # Load common then run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/common.sh . $CLI_DIR/common.sh
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -105,8 +105,6 @@ checkDir() {
# load and run these tests with shunit2! # load and run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -26,8 +26,6 @@ testMakeKeys() {
# load and run these tests with shunit2! # load and run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -151,9 +151,7 @@ test04CreateRoleInvalid() {
# Load common then run these tests with shunit2! # Load common then run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/common.sh . $CLI_DIR/common.sh
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -78,9 +78,7 @@ test01OnRestart() {
# Load common then run these tests with shunit2! # Load common then run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/common.sh . $CLI_DIR/common.sh
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -90,9 +90,7 @@ test03SendMultiFromRole() {
# Load common then run these tests with shunit2! # Load common then run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/common.sh . $CLI_DIR/common.sh
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -127,7 +127,6 @@ test03Waiting() {
# load and run these tests with shunit2! # load and run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -112,9 +112,7 @@ test03AddCount() {
# Load common then run these tests with shunit2! # Load common then run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
# TODO: how to handle this if we are not in the same directory
CLI_DIR=${DIR}/../../../../tests/cli
. $CLI_DIR/common.sh . $CLI_DIR/common.sh
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2

View File

@ -66,7 +66,7 @@ test00SetGetRemove() {
# Load common then run these tests with shunit2! # Load common then run these tests with shunit2!
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
CLI_DIR=${DIR}/../../../../tests/cli CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli
. $CLI_DIR/common.sh . $CLI_DIR/common.sh
. $CLI_DIR/shunit2 . $CLI_DIR/shunit2