From f5fa2ff23a3f27b3382b97bbeb005bd0bad76680 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 15 May 2019 09:42:06 -0400 Subject: [PATCH] Adding Pete's fixes to system test scripts --- .../system_test_scripts/spreader_simple_sanity.sh | 13 +++++++++++-- .../system_test_scripts/test_clip_limits.sh | 14 ++++++++++++-- .../system_test_scripts/test_position_limits.sh | 13 +++++++++++-- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh index cc1deacfc..622c012e4 100644 --- a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh +++ b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh @@ -7,10 +7,16 @@ else sparkdata_dir=/sparkdata fi +config=$sparkdata_dir/conf/spark.conf +bak=$sparkdata_dir/conf/spark.conf.bak + rm -r $sparkdata_dir/data/databases/ 2>/dev/null [ ! -d "$sparkdata_dir/conf" ] && mkdir $sparkdata_dir/conf/ -mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak 2>/dev/null + +if [ -f "$conf" ];then + mv $conf $bak 2>/dev/null +fi cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { @@ -38,4 +44,7 @@ sleep 120 dotnet sparkcmd.dll test spreader_simple_sanity pkill -P $$ -mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file + +if [ -f "$bak" ];then + mv $bak $conf +fi \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_clip_limits.sh b/src/client/spark_test/system_test_scripts/test_clip_limits.sh index da53d7f7a..fa6501da3 100644 --- a/src/client/spark_test/system_test_scripts/test_clip_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_clip_limits.sh @@ -7,10 +7,17 @@ else sparkdata_dir=/sparkdata fi +config=$sparkdata_dir/conf/spark.conf +bak=$sparkdata_dir/conf/spark.conf.bak + + rm -r $sparkdata_dir/data/databases/ 2>/dev/null [ ! -d "$sparkdata_dir/conf" ] && mkdir $sparkdata_dir/conf/ -mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak 2>/dev/null + +if [ -f "$conf" ];then + mv $conf $bak 2>/dev/null +fi cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { @@ -37,4 +44,7 @@ sleep 120 dotnet sparkcmd.dll test test_clip_limits pkill -P $$ -mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file + +if [ -f "$bak" ];then + mv $bak $conf +fi \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh index 9dcffd955..045eece76 100644 --- a/src/client/spark_test/system_test_scripts/test_position_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh @@ -7,10 +7,16 @@ else sparkdata_dir=/sparkdata fi +config=$sparkdata_dir/conf/spark.conf +bak=$sparkdata_dir/conf/spark.conf.bak + rm -r $sparkdata_dir/data/databases/ 2>/dev/null [ ! -d "$sparkdata_dir/conf" ] && mkdir $sparkdata_dir/conf/ -mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak 2>/dev/null + +if [ -f "$conf" ];then + mv $conf $bak 2>/dev/null +fi cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { @@ -37,4 +43,7 @@ sleep 120 dotnet sparkcmd.dll test test_position_limits pkill -P $$ -mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file + +if [ -f "$bak" ];then + mv $bak $conf +fi \ No newline at end of file