From c0ad3d349465ed1970bf117f1d48192e4495749d Mon Sep 17 00:00:00 2001 From: rcernich Date: Wed, 6 Jun 2018 11:18:12 -0600 Subject: [PATCH] CLOUD-2261 more tweaks to pass unit tests Signed-off-by: rcernich --- os-partition/added/partitionPV.sh | 6 +++--- tests/features/datagrid/datagrid_split.feature | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os-partition/added/partitionPV.sh b/os-partition/added/partitionPV.sh index 59266706..54732020 100644 --- a/os-partition/added/partitionPV.sh +++ b/os-partition/added/partitionPV.sh @@ -114,7 +114,7 @@ function migratePV() { # 1.a.i) if is not in the cluster echo "examining existence of living pod for directory: '${applicationPodDir}'" unset LIVING_PODS - LIVING_PODS=($(${BASH_SOURCE[0]}/query.py -q pods_living -f list_space ${DEBUG_QUERY_API_PARAM})) + LIVING_PODS=($($(dirname ${BASH_SOURCE[0]})/query.py -q pods_living -f list_space ${DEBUG_QUERY_API_PARAM})) [ $? -ne 0 ] && echo "ERROR: Can't get list of living pods" && continue STATUS=-1 # here we have data about living pods and the recovery marker can be removed if the pod is living if ! arrContains ${applicationPodName} "${LIVING_PODS[@]}"; then @@ -174,7 +174,7 @@ function migratePV() { local recoveryPodNameToCheck=${recoveryPodFileToCheck#*RECOVERY-} unset LIVING_PODS - LIVING_PODS=($(${BASH_SOURCE[0]}/query.py -q pods_living -f list_space ${DEBUG_QUERY_API_PARAM})) + LIVING_PODS=($($(dirname ${BASH_SOURCE[0]})/query.py -q pods_living -f list_space ${DEBUG_QUERY_API_PARAM})) [ $? -ne 0 ] && echo "ERROR: Can't get list of living pods" && continue if ! arrContains ${recoveryPodNameToCheck} "${LIVING_PODS[@]}"; then @@ -196,7 +196,7 @@ function probePodLog() { init_pod_name local podNameToProbe=${1:-$POD_NAME} - local logOutput=$(${BASH_SOURCE[0]}/query.py -q log ${podNameToProbe}) + local logOutput=$($(dirname ${BASH_SOURCE[0]})/query.py -q log ${podNameToProbe}) local probeStatus=$? if [ $probeStatus -ne 0 ]; then diff --git a/tests/features/datagrid/datagrid_split.feature b/tests/features/datagrid/datagrid_split.feature index 6148b55c..ea2c1b5c 100644 --- a/tests/features/datagrid/datagrid_split.feature +++ b/tests/features/datagrid/datagrid_split.feature @@ -4,7 +4,7 @@ Feature: Openshift DataGrid SPLIT tests Scenario: Ensure split doesn't happen with regular configuration When container is ready Then container log should match regex .*Data Grid.*started.* - And available container log should not contain Attempting to obtain lock for directory: + And available container log should contain jboss.server.data.dir = /opt/datagrid/standalone/data @jboss-datagrid-6 @jboss-datagrid-7 Scenario: Ensure split happens with SPLIT_DATA @@ -12,7 +12,7 @@ Feature: Openshift DataGrid SPLIT tests | variable | value | | SPLIT_DATA | TRUE | Then container log should match regex .*Data Grid.*started.* - And available container log should contain Attempting to obtain lock for directory: + And available container log should contain jboss.server.data.dir = /opt/datagrid/standalone/partitioned_data/ @jboss-datagrid-7 Scenario: Ensure split happens with DATAGRID_SPLIT @@ -20,4 +20,4 @@ Feature: Openshift DataGrid SPLIT tests | variable | value | | DATAGRID_SPLIT | TRUE | Then container log should match regex .*Data Grid.*started.* - And available container log should contain Attempting to obtain lock for directory: + And available container log should contain jboss.server.data.dir = /opt/datagrid/standalone/partitioned_data/