[taler-anastasis] 04/12: do not delete test ressources

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 0ead2613baf40dc3e0278c3d1d761fc758138dc8
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Tue Dec 1 21:46:16 2020 +0100

    do not delete test ressources
---
 src/cli/Makefile.am                                     | 3 ++-
 src/cli/test_anastasis_reducer_add_authentication.sh    | 9 +++++----
 src/cli/test_anastasis_reducer_done_authentication.sh   | 8 ++++----
 src/cli/test_anastasis_reducer_done_policy_review.sh    | 8 ++++----
 src/cli/test_anastasis_reducer_enter_secret.sh          | 4 ++--
 src/cli/test_anastasis_reducer_enter_user_attributes.sh | 8 ++++----
 src/cli/test_anastasis_reducer_select_country.sh        | 5 +++--
 7 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index f9525e2..0eabb1b 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -31,7 +31,8 @@ EXTRA_DIST = \
   test_anastasis_reducer.conf \
   test_anastasis_reducer_1.conf \
   test_anastasis_reducer_2.conf \
-  test_anastasis_reducer_3.conf
+  test_anastasis_reducer_3.conf \
+  test_reducer_home/ressources
 
 anastasis_reducer_SOURCES = \
   anastasis-cli-redux.c
diff --git a/src/cli/test_anastasis_reducer_add_authentication.sh 
b/src/cli/test_anastasis_reducer_add_authentication.sh
index 353a460..01dc872 100755
--- a/src/cli/test_anastasis_reducer_add_authentication.sh
+++ b/src/cli/test_anastasis_reducer_add_authentication.sh
@@ -21,16 +21,16 @@ function cleanup()
     do
         kill $n 2> /dev/null || true
     done
-    rm -f $SFILE $TFILE $UFILE
+    rm -f $SFILE $TFILE
     wait
 }
 
 # Install cleanup handler (except for kill -9)
 SFILE=`mktemp test_reducer_stateXXXXXX`
 TFILE=`mktemp test_reducer_stateXXXXXX`
-UFILE=test_reducer_stateAESTATE
-# Tempfile used und deleted by other test
-VFILE=test_reducer_stateAESTATE_FINAL
+UFILE=ressources/test_reducer_stateAESTATE
+# Tempfile used by other test
+VFILE=ressources/test_reducer_stateAESTATE_FINAL
 
 
 trap cleanup EXIT
@@ -91,6 +91,7 @@ then
 fi
 
 #Third method
+mkdir -p ressources
 touch $VFILE
 ./anastasis-reducer -a \
   '{"authentication_method": {
diff --git a/src/cli/test_anastasis_reducer_done_authentication.sh 
b/src/cli/test_anastasis_reducer_done_authentication.sh
index a0a693b..10aabf3 100755
--- a/src/cli/test_anastasis_reducer_done_authentication.sh
+++ b/src/cli/test_anastasis_reducer_done_authentication.sh
@@ -21,14 +21,13 @@ function cleanup()
     do
         kill $n 2> /dev/null || true
     done
-    rm -f $UFILE
     wait
 }
 
 # Install cleanup handler (except for kill -9)
-UFILE=test_reducer_stateAESTATE_FINAL
-# Tempfile used und deleted by other test
-VFILE=test_reducer_statePRSTATE
+UFILE=ressources/test_reducer_stateAESTATE_FINAL
+# Tempfile used by other test
+VFILE=ressources/test_reducer_statePRSTATE
 
 
 trap cleanup EXIT
@@ -44,6 +43,7 @@ echo "Beginning with actual reducer test"
 # Test done authentication in a backup state
 echo " "
 echo "Test done authentication (next) in a backup state"
+mkdir -p ressources
 touch $VFILE
 ./anastasis-reducer -a \
   '{}' \
diff --git a/src/cli/test_anastasis_reducer_done_policy_review.sh 
b/src/cli/test_anastasis_reducer_done_policy_review.sh
index ed9ceae..7f463c3 100755
--- a/src/cli/test_anastasis_reducer_done_policy_review.sh
+++ b/src/cli/test_anastasis_reducer_done_policy_review.sh
@@ -21,14 +21,13 @@ function cleanup()
     do
         kill $n 2> /dev/null || true
     done
-    rm -f $UFILE
     wait
 }
 
 # Install cleanup handler (except for kill -9)
-UFILE=test_reducer_statePRSTATE
-# Tempfile used und deleted by other test
-VFILE=test_reducer_stateSESTATE
+UFILE=ressources/test_reducer_statePRSTATE
+# Tempfile used by other test
+VFILE=ressources/test_reducer_stateSESTATE
 
 
 trap cleanup EXIT
@@ -44,6 +43,7 @@ echo "Beginning with actual reducer test"
 # Test done policy review in a backup state
 echo " "
 echo "Test done policy review (next) in a backup state"
+mkdir -p ressources
 touch $VFILE
 ./anastasis-reducer -a \
   '{}' \
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh 
b/src/cli/test_anastasis_reducer_enter_secret.sh
index 4f0bd59..64adc19 100755
--- a/src/cli/test_anastasis_reducer_enter_secret.sh
+++ b/src/cli/test_anastasis_reducer_enter_secret.sh
@@ -21,7 +21,7 @@ function cleanup()
     do
         kill $n 2> /dev/null || true
     done
-    rm -f $TFILE $CONF $CONF_1 $CONF_2 $CONF_3 $CONF_4 
+    rm -f $SFILE $TFILE $CONF $CONF_1 $CONF_2 $CONF_3 $CONF_4 
     wait
 }
 
@@ -32,7 +32,7 @@ CONF_1=`mktemp test_reducerXXXXXX_1.conf`
 CONF_2=`mktemp test_reducerXXXXXX_2.conf`
 CONF_3=`mktemp test_reducerXXXXXX_3.conf`
 CONF_4=`mktemp test_reducerXXXXXX_4.conf`
-SFILE=test_reducer_stateSESTATE
+SFILE=ressources/test_reducer_stateSESTATE
 TFILE=`mktemp test_reducer_stateXXXXXX`
 
 trap cleanup EXIT
diff --git a/src/cli/test_anastasis_reducer_enter_user_attributes.sh 
b/src/cli/test_anastasis_reducer_enter_user_attributes.sh
index 7a85d8e..c29fdf5 100755
--- a/src/cli/test_anastasis_reducer_enter_user_attributes.sh
+++ b/src/cli/test_anastasis_reducer_enter_user_attributes.sh
@@ -21,14 +21,13 @@ function cleanup()
     do
         kill $n 2> /dev/null || true
     done
-    rm -f $UFILE
     wait
 }
 
 # Install cleanup handler (except for kill -9)
-UFILE=test_reducer_stateUACSTATE
-# Tempfile used und deleted by other test
-VFILE=test_reducer_stateAESTATE
+UFILE=ressources/test_reducer_stateUACSTATE
+# Tempfile used other test
+VFILE=ressources/test_reducer_stateAESTATE
 
 trap cleanup EXIT
 
@@ -43,6 +42,7 @@ echo "Beginning with actual reducer test"
 # Test user attributes collection in a backup state
 echo " "
 echo "Test user attributes collection in a backup state"
+mkdir -p ressources
 touch $VFILE
 ./anastasis-reducer -a \
   '{"identity_attributes": {
diff --git a/src/cli/test_anastasis_reducer_select_country.sh 
b/src/cli/test_anastasis_reducer_select_country.sh
index 4a060ca..d4f8498 100755
--- a/src/cli/test_anastasis_reducer_select_country.sh
+++ b/src/cli/test_anastasis_reducer_select_country.sh
@@ -32,8 +32,8 @@ CONF_3=`mktemp test_reducerXXXXXX_3.conf`
 CONF_4=`mktemp test_reducerXXXXXX_4.conf`
 SFILE=`mktemp test_reducer_stateXXXXXX`
 TFILE=`mktemp test_reducer_stateXXXXXX`
-# Tempfile used und deleted by other test
-UFILE=test_reducer_stateUACSTATE
+# Tempfile used by other test
+UFILE=ressources/test_reducer_stateUACSTATE
 
 trap cleanup EXIT
 
@@ -104,6 +104,7 @@ echo " "
 echo "Test country selection in a backup state"
 ./anastasis-reducer -b $SFILE
 ./anastasis-reducer -a '{"continent": "Europe"}' select_continent $SFILE $TFILE
+mkdir -p ressources
 touch $UFILE
 ./anastasis-reducer -a \
   '{"country": "Switzerland", 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.