more tests

t/10_2c_1d_2p_pub_export

@@ -34,22 +34,25 @@ OUTPUT1=$(./cocktail -v \
            -d "$DOSSIER" \
            -p "$PROJET1" \
            -b "$URL_BASE" \
-           -g "$URL_GARDE" 2>&1 >/dev/null &)
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
 pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
 
 OUTPUT2=$(./cocktail -v \
            -d "$DOSSIER" \
            -p "$PROJET2" \
            -b "$URL_BASE" \
-           -g "$URL_GARDE" 2>&1 >/dev/null &)
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
 pids+=($!)
+OUTPUT="START $!"
 
 # Wait until all background processes are stopped
 while [ ${#pids[@]} -gt 0 ];
 do
-  echo "WAITING FOR: ${pids[@]}";
-  sleep 2;
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
 done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
 
 # affichage des code retour et generation de la chaine de test
 for pid in "${!retcode[@]}"
@@ -62,15 +65,11 @@ echo -n "RC $statusstring "
 if test "$retcodestr" -eq "00";
 then
   echo "[  OK  ]"
-  echo "$OUTPUT1"
-  echo "---"
-  echo "$OUTPUT2"
+  echo "$OUTPUT"
   exit 0
 else
   echo "[FAILED]"
-  echo "$OUTPUT1"
-  echo "---"
-  echo "$OUTPUT2"
+  echo "$OUTPUT"
   exit 1
 fi
 

t/11_2c_1d_2p_pub

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+printf "$PRINTFPATTERN" $0 : "2 Compilations. 1 Dossier. 2 Projets. Pad Public."
+
+URL_BASE=https%3A%2F%2Fpad.exegetes.eu.org%2Fp%2Fg.DSXI1kGFT1gjor66%24Abro-REP-Tele2-Principal
+URL_GARDE=https%3A%2F%2Fpad.exegetes.eu.org%2Fp%2Fg.DSXI1kGFT1gjor66%24Abro-REP-Tele2-Garde
+DOSSIER=MonDossier$$
+PROJET1=Abro2$$
+PROJET2=Abro3
+
+# pids conserve la liste des pids
+# retcode conserve le code retour de chaque pid une fois terminé
+handle_child() {
+  local tmp=()
+  for((i=0;i<${#pids[@]};++i));
+  do
+    if test ! -d /proc/${pids[i]};
+    then
+      wait ${pids[i]}
+      retcode[${pids[i]}]=$?
+    else
+      tmp+=(${pids[i]})
+    fi
+  done
+  pids=(${tmp[@]})
+}
+
+set -o monitor
+trap "handle_child" CHLD
+
+
+# Start background processes
+OUTPUT1=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET1" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
+
+OUTPUT2=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET2" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT="START $!"
+
+# Wait until all background processes are stopped
+while [ ${#pids[@]} -gt 0 ];
+do
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
+done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
+
+# affichage des code retour et generation de la chaine de test
+for pid in "${!retcode[@]}"
+do
+  statusstring="$statusstring $pid=${retcode[$pid]}"
+  retcodestr="${retcodestr}${retcode[$pid]}"
+done
+echo -n "RC $statusstring "
+
+if test "$retcodestr" -eq "00";
+then
+  echo "[  OK  ]"
+  echo "$OUTPUT"
+  exit 0
+else
+  echo "[FAILED]"
+  echo "$OUTPUT"
+  exit 1
+fi
+

t/12_2c_1d_1p_pub_export

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+printf "$PRINTFPATTERN" $0 : "2 Compilations. 1 Dossier. 1 Projet. Pad Public. export/txt"
+
+URL_BASE=https%3A%2F%2Fpad.exegetes.eu.org%2Fp%2Fg.DSXI1kGFT1gjor66%24Abro-REP-Tele2-Principal%2Fexport%2Ftxt
+URL_GARDE=https%3A%2F%2Fpad.exegetes.eu.org%2Fp%2Fg.DSXI1kGFT1gjor66%24Abro-REP-Tele2-Garde%2Fexport%2Ftxt
+DOSSIER=MonDossier$$
+PROJET=Abro2$$
+
+# pids conserve la liste des pids
+# retcode conserve le code retour de chaque pid une fois terminé
+handle_child() {
+  local tmp=()
+  for((i=0;i<${#pids[@]};++i));
+  do
+    if test ! -d /proc/${pids[i]};
+    then
+      wait ${pids[i]}
+      retcode[${pids[i]}]=$?
+    else
+      tmp+=(${pids[i]})
+    fi
+  done
+  pids=(${tmp[@]})
+}
+
+set -o monitor
+trap "handle_child" CHLD
+
+
+# Start background processes
+OUTPUT1=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
+
+OUTPUT2=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT="START $!"
+
+# Wait until all background processes are stopped
+while [ ${#pids[@]} -gt 0 ];
+do
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
+done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
+
+# affichage des code retour et generation de la chaine de test
+for pid in "${!retcode[@]}"
+do
+  statusstring="$statusstring $pid=${retcode[$pid]}"
+  retcodestr="${retcodestr}${retcode[$pid]}"
+done
+echo -n "RC $statusstring "
+
+if test $retcodestr -eq "02" -o $retcodestr -eq "20";
+then
+  echo "[  OK  ]"
+  echo "$OUTPUT"
+  exit 0
+else
+  echo "[FAILED]"
+  echo "$OUTPUT"
+  exit 1
+fi
+

t/13_2c_1d_1p_pub

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+printf "$PRINTFPATTERN" $0 : "2 Compilations. 1 Dossier. 1 Projet. Pad Public. export/txt"
+
+URL_BASE=https%3A%2F%2Fpad.exegetes.eu.org%2Fp%2Fg.DSXI1kGFT1gjor66%24Abro-REP-Tele2-Principal%2Fexport%2Ftxt
+URL_GARDE=https%3A%2F%2Fpad.exegetes.eu.org%2Fp%2Fg.DSXI1kGFT1gjor66%24Abro-REP-Tele2-Garde%2Fexport%2Ftxt
+DOSSIER=MonDossier$$
+PROJET=Abro2$$
+
+# pids conserve la liste des pids
+# retcode conserve le code retour de chaque pid une fois terminé
+handle_child() {
+  local tmp=()
+  for((i=0;i<${#pids[@]};++i));
+  do
+    if test ! -d /proc/${pids[i]};
+    then
+      wait ${pids[i]}
+      retcode[${pids[i]}]=$?
+    else
+      tmp+=(${pids[i]})
+    fi
+  done
+  pids=(${tmp[@]})
+}
+
+set -o monitor
+trap "handle_child" CHLD
+
+
+# Start background processes
+OUTPUT1=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
+
+OUTPUT2=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT="START $!"
+
+# Wait until all background processes are stopped
+while [ ${#pids[@]} -gt 0 ];
+do
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
+done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
+
+# affichage des code retour et generation de la chaine de test
+for pid in "${!retcode[@]}"
+do
+  statusstring="$statusstring $pid=${retcode[$pid]}"
+  retcodestr="${retcodestr}${retcode[$pid]}"
+done
+echo -n "RC $statusstring "
+
+if test $retcodestr -eq "02" -o $retcodestr -eq "20";
+then
+  echo "[  OK  ]"
+  echo "$OUTPUT"
+  exit 0
+else
+  echo "[FAILED]"
+  echo "$OUTPUT"
+  exit 1
+fi
+

t/14_2c_1d_2p_priv_export

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+printf "$PRINTFPATTERN" $0 : "2 Compilations. 1 Dossier. 2 Projets. Pad Privé. export/txt"
+
+if test "$TRAVIS" == "true";
+then
+  echo "[ SKIP ]"
+  exit 99
+fi
+
+URL_BASE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2-PRIVE%2Fexport%2Ftxt
+URL_GARDE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2Garde-PRIVE%2Fexport%2Ftxt
+DOSSIER=MonDossier$$
+PROJET1=Abro2$$
+PROJET2=Abro3
+
+# pids conserve la liste des pids
+# retcode conserve le code retour de chaque pid une fois terminé
+handle_child() {
+  local tmp=()
+  for((i=0;i<${#pids[@]};++i));
+  do
+    if test ! -d /proc/${pids[i]};
+    then
+      wait ${pids[i]}
+      retcode[${pids[i]}]=$?
+    else
+      tmp+=(${pids[i]})
+    fi
+  done
+  pids=(${tmp[@]})
+}
+
+set -o monitor
+trap "handle_child" CHLD
+
+
+# Start background processes
+OUTPUT1=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET1" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT="START $!"
+
+OUTPUT2=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET2" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
+
+# Wait until all background processes are stopped
+while [ ${#pids[@]} -gt 0 ];
+do
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
+done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
+
+# affichage des code retour et generation de la chaine de test
+for pid in "${!retcode[@]}"
+do
+  statusstring="$statusstring $pid=${retcode[$pid]}"
+  retcodestr="${retcodestr}${retcode[$pid]}"
+done
+echo -n "RC $statusstring "
+
+if test "$retcodestr" -eq "00";
+then
+  echo "[  OK  ]"
+  echo "$OUTPUT"
+  exit 0
+else
+  echo "[FAILED]"
+  echo "$OUTPUT"
+  exit 1
+fi
+

t/15_2c_1d_2p_priv

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+printf "$PRINTFPATTERN" $0 : "2 Compilations. 1 Dossier. 2 Projets. Pad Privé."
+
+if test "$TRAVIS" == "true";
+then
+  echo "[ SKIP ]"
+  exit 99
+fi
+
+URL_BASE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2-PRIVE
+URL_GARDE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2Garde-PRIVE
+DOSSIER=MonDossier$$
+PROJET1=Abro2$$
+PROJET2=Abro3
+
+# pids conserve la liste des pids
+# retcode conserve le code retour de chaque pid une fois terminé
+handle_child() {
+  local tmp=()
+  for((i=0;i<${#pids[@]};++i));
+  do
+    if test ! -d /proc/${pids[i]};
+    then
+      wait ${pids[i]}
+      retcode[${pids[i]}]=$?
+    else
+      tmp+=(${pids[i]})
+    fi
+  done
+  pids=(${tmp[@]})
+}
+
+set -o monitor
+trap "handle_child" CHLD
+
+
+# Start background processes
+OUTPUT1=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET1" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT="START $!"
+
+OUTPUT2=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET2" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
+
+# Wait until all background processes are stopped
+while [ ${#pids[@]} -gt 0 ];
+do
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
+done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
+
+# affichage des code retour et generation de la chaine de test
+for pid in "${!retcode[@]}"
+do
+  statusstring="$statusstring $pid=${retcode[$pid]}"
+  retcodestr="${retcodestr}${retcode[$pid]}"
+done
+echo -n "RC $statusstring "
+
+if test "$retcodestr" -eq "00";
+then
+  echo "[  OK  ]"
+  echo "$OUTPUT"
+  exit 0
+else
+  echo "[FAILED]"
+  echo "$OUTPUT"
+  exit 1
+fi
+

t/16_2c_1d_1p_priv_export

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+printf "$PRINTFPATTERN" $0 : "2 Compilations. 1 Dossier. 1 Projet. Pad Privé. export/txt"
+
+if test "$TRAVIS" == "true";
+then
+  echo "[ SKIP ]"
+  exit 99
+fi
+
+URL_BASE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2-PRIVE%2Fexport%2Ftxt
+URL_GARDE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2Garde-PRIVE%2Fexport%2Ftxt
+DOSSIER=MonDossier$$
+PROJET=Abro2$$
+
+# pids conserve la liste des pids
+# retcode conserve le code retour de chaque pid une fois terminé
+handle_child() {
+  local tmp=()
+  for((i=0;i<${#pids[@]};++i));
+  do
+    if test ! -d /proc/${pids[i]};
+    then
+      wait ${pids[i]}
+      retcode[${pids[i]}]=$?
+    else
+      tmp+=(${pids[i]})
+    fi
+  done
+  pids=(${tmp[@]})
+}
+
+set -o monitor
+trap "handle_child" CHLD
+
+
+# Start background processes
+OUTPUT1=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT="START $!"
+
+OUTPUT2=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
+
+# Wait until all background processes are stopped
+while [ ${#pids[@]} -gt 0 ];
+do
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
+done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
+
+# affichage des code retour et generation de la chaine de test
+for pid in "${!retcode[@]}"
+do
+  statusstring="$statusstring $pid=${retcode[$pid]}"
+  retcodestr="${retcodestr}${retcode[$pid]}"
+done
+echo -n "RC $statusstring "
+
+if test $retcodestr -eq "02" -o $retcodestr -eq "20";
+then
+  echo "[  OK  ]"
+  echo "$OUTPUT"
+  exit 0
+else
+  echo "[FAILED]"
+  echo "$OUTPUT"
+  exit 1
+fi
+

t/17_2c_1d_1p_priv

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+printf "$PRINTFPATTERN" $0 : "2 Compilations. 1 Dossier. 1 Projet. Pad Privé."
+
+if test "$TRAVIS" == "true";
+then
+  echo "[ SKIP ]"
+  exit 99
+fi
+
+URL_BASE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2-PRIVE
+URL_GARDE=https%3A%2F%2Fpad.exegetes.eu.org%2Fgroup.html%2F19%2Fpad.html%2Fg.STVKtWnA83RsmVUC%24Abro2Garde-PRIVE
+DOSSIER=MonDossier$$
+PROJET=Abro2$$
+
+# pids conserve la liste des pids
+# retcode conserve le code retour de chaque pid une fois terminé
+handle_child() {
+  local tmp=()
+  for((i=0;i<${#pids[@]};++i));
+  do
+    if test ! -d /proc/${pids[i]};
+    then
+      wait ${pids[i]}
+      retcode[${pids[i]}]=$?
+    else
+      tmp+=(${pids[i]})
+    fi
+  done
+  pids=(${tmp[@]})
+}
+
+set -o monitor
+trap "handle_child" CHLD
+
+
+# Start background processes
+OUTPUT1=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT="START $!"
+
+OUTPUT2=$(./cocktail -v \
+           -d "$DOSSIER" \
+           -p "$PROJET" \
+           -b "$URL_BASE" \
+           -g "$URL_GARDE" 2>&1 >/dev/null) &
+pids+=($!)
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "START $!")
+
+# Wait until all background processes are stopped
+while [ ${#pids[@]} -gt 0 ];
+do
+  OUTPUT=$(printf "%s\n%s %s %s" "$OUTPUT" "WAITING FOR: "${pids[@]})
+  sleep 4;
+done
+OUTPUT=$(printf "%s\n%s" "$OUTPUT" "STOPPED")
+
+# affichage des code retour et generation de la chaine de test
+for pid in "${!retcode[@]}"
+do
+  statusstring="$statusstring $pid=${retcode[$pid]}"
+  retcodestr="${retcodestr}${retcode[$pid]}"
+done
+echo -n "RC $statusstring "
+
+if test $retcodestr -eq "02" -o $retcodestr -eq "20";
+then
+  echo "[  OK  ]"
+  echo "$OUTPUT"
+  exit 0
+else
+  echo "[FAILED]"
+  echo "$OUTPUT"
+  exit 1
+fi
+