[GNUnet-SVN] r15363 - gauger/web

[gnunet]

Author: bartpolot
Date: 2011-05-31 05:02:00 +0200 (Tue, 31 May 2011)
New Revision: 15363

Added:
   gauger/web/test_data0
Modified:
   gauger/web/run_test.sh
   gauger/web/test_data2
   gauger/web/test_data3
   gauger/web/test_data4
   gauger/web/test_data5
Log:
Improved testing code


Modified: gauger/web/run_test.sh
===================================================================
--- gauger/web/run_test.sh      2011-05-31 00:15:15 UTC (rev 15362)
+++ gauger/web/run_test.sh      2011-05-31 03:02:00 UTC (rev 15363)
@@ -1,19 +1,21 @@
 #!/bin/bash
 
-# METHOD CAN BE EITHER php OR py
-METHOD="php"
+VERBOSE=0
 
-#URL="http://localhost:8080";;
-PHP_URL="http://localhost/gauger/web/hosts/testhost";;
+# METHOD CAN BE EITHER curl OR native
+# native also tests the client for potential conflics
+# but curl is 15x faster (recommended for testing
+# server-side-only changes)
+METHOD="curl"
 
-PY_HOST="localhost"
-
 DATADIR="gnunetorg";
 
 USER="testuser";
 PASS="123456";
 HOST="testhost";
 
+PHP_URL="http://localhost/gauger/web/hosts/$HOST";;
+
 R=0;
 
 rm -f *~ 2>&1 > /dev/null;
@@ -36,35 +38,40 @@
        done
        rev=${d[0]};
        value=${d[1]};
-       if [ "$METHOD" = "php" ]; then
-           curl -s -d 
"user=$USER&pass=$PASS&name=$i&value=$value&revision=$rev"  $PHP_URL >> log$N;
-       elif [ "$METHOD" = "py" ]; then
-           echo "$USER,$PASS,$value,$i,$rev" | nc $PY_HOST 10111
+       if [ "$VERBOSE" = "1" ]; then
+           echo -n "$rev ";
        fi
+       if [ "$METHOD" = "curl" ]; then
+           curl -s -d 
"user=$USER&pass=$PASS&name=TEST:::${i}___unit&value=$value&revision=$rev"  
$PHP_URL >> log$N;
+       elif [ "$METHOD" = "native" ]; then
+           python2 ../gauger -c TEST -n $i -u unit -d $value -i $rev >> log$N;
+           cp "$DATADIR/$HOST/TEST:::${i}___unit" "test_R$rev";
+       fi
     done
     sleep 0.5;
     
-    cat $DATADIR/$HOST/$i 2>/dev/null | sort -n > sortedfile1;
-    diff -n $DATADIR/$HOST/$i sortedfile1 > /dev/null 2>&1;
+    cat "$DATADIR/$HOST/TEST:::${i}___unit" 2>/dev/null | sort -n > 
sortedfile1;
+    diff -n "$DATADIR/$HOST/TEST:::${i}___unit" sortedfile1 > /dev/null 2>&1;
     PHASE1=$?;
 
-    cat $DATADIR/$HOST/$i.dat  2>/dev/null | sort -n > sortedfile2;
-    diff -n $DATADIR/$HOST/$i.dat sortedfile2 > /dev/null 2>&1;
+    cat "$DATADIR/$HOST/TEST:::${i}___unit.dat"  2>/dev/null | sort -n > 
sortedfile2;
+    diff -n "$DATADIR/$HOST/TEST:::${i}___unit.dat" sortedfile2 > /dev/null 
2>&1;
     PHASE2=$?;
 
     if [ "$PHASE1" != "0" ] || [ "$PHASE2" != "0" ]; then
        echo "TEST $N FAILED ($PHASE1 $PHASE2)"
        R=1;
-       mv -f $DATADIR/$HOST/$i $i.res > /dev/null 2>&1;
+       mv -f "$DATADIR/$HOST/TEST:::${i}___unit" ${i}.res > /dev/null 2>&1;
        mv -f sortedfile1 result$N > /dev/null 2>&1;
        mv -f sortedfile1 result$N.dat > /dev/null 2>&1;
     else
        echo " OK";
        rm -f log$N  > /dev/null 2>&1;
-       rm -f $DATADIR/$HOST/$i > /dev/null 2>&1;
-       rm -f $DATADIR/$HOST/$i.dat sortedfile1 sortedfile2 > /dev/null 2>&1;
+       rm -f test_R*  > /dev/null 2>&1;
+       rm -f "$DATADIR/$HOST/TEST:::${i}___unit" > /dev/null 2>&1;
+       rm -f "$DATADIR/$HOST/TEST:::${i}___unit.dat" sortedfile1 sortedfile2 > 
/dev/null 2>&1;
     fi
 done
 
 echo "All test finished";
-exit $R;
\ No newline at end of file
+exit $R;

Added: gauger/web/test_data0
===================================================================
--- gauger/web/test_data0                               (rev 0)
+++ gauger/web/test_data0       2011-05-31 03:02:00 UTC (rev 15363)
@@ -0,0 +1 @@
+1 1

Modified: gauger/web/test_data2
===================================================================
--- gauger/web/test_data2       2011-05-31 00:15:15 UTC (rev 15362)
+++ gauger/web/test_data2       2011-05-31 03:02:00 UTC (rev 15363)
@@ -1,12 +1,6 @@
-1 1
-2 2
-3 3
-4 4
-5 5
 6 6
-1 1
-2 2
-3 3
-4 4
 5 5
-6 6
+4 4
+3 3
+2 2
+1 1

Modified: gauger/web/test_data3
===================================================================
--- gauger/web/test_data3       2011-05-31 00:15:15 UTC (rev 15362)
+++ gauger/web/test_data3       2011-05-31 03:02:00 UTC (rev 15363)
@@ -1,6 +1,99 @@
+1 1
+2 2
+3 3
+4 4
+5 5
 6 6
-5 5
-4 4
-3 3
-2 2
-1 1
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+50 50
+51 51
+52 52
+53 53
+54 54
+55 55
+56 56
+57 57
+58 58
+59 59
+60 60
+61 61
+62 62
+63 63
+64 64
+65 65
+66 66
+67 67
+68 68
+69 69
+70 70
+71 71
+72 72
+73 73
+74 74
+75 75
+76 76
+77 77
+78 78
+79 79
+80 80
+81 81
+82 82
+83 83
+84 84
+85 85
+86 86
+87 87
+88 88
+89 89
+90 90
+91 91
+92 92
+93 93
+94 94
+95 95
+96 96
+97 97
+98 98
+99 99

Modified: gauger/web/test_data4
===================================================================
--- gauger/web/test_data4       2011-05-31 00:15:15 UTC (rev 15362)
+++ gauger/web/test_data4       2011-05-31 03:02:00 UTC (rev 15363)
@@ -1,100 +1,99 @@
-1 95
-2 111
-3 106
-4 104
-5 95
-6 116
-7 94
-8 99
-9 106
-10 93
-11 102
-12 96
-13 107
-14 113
-15 90
-16 111
-17 121
-18 110
-19 107
-20 94
-21 112
-22 101
-23 109
-24 92
-25 110
-26 117
-27 117
-28 106
-29 102
-30 91
-31 120
-32 118
-33 109
-34 91
-35 114
-36 111
-37 116
-38 102
-39 103
-40 104
-41 93
-42 120
-43 103
-44 90
-45 100
-46 112
-47 91
-48 108
-49 104
-50 103
-51 94
-52 108
-53 119
-54 120
-55 114
-56 92
-57 121
-58 116
-59 115
-60 111
-61 114
-62 99
-63 108
-64 103
-65 90
-66 93
-67 93
-68 104
-69 111
-70 108
-71 95
-72 112
-73 91
-74 120
-75 108
-76 122
-77 106
-78 92
-79 103
-80 92
-81 116
-82 94
-83 90
-84 98
-85 113
-86 105
-87 94
-88 92
-89 109
-90 91
-91 114
-92 101
-93 95
-94 109
-95 120
-96 105
-97 104
-98 101
-99 101
-100 106
+99 99
+98 98
+97 97
+96 96
+95 95
+94 94
+93 93
+92 92
+91 91
+90 90
+89 89
+88 88
+87 87
+86 86
+85 85
+84 84
+83 83
+82 82
+81 81
+80 80
+79 79
+78 78
+77 77
+76 76
+75 75
+74 74
+73 73
+72 72
+71 71
+70 70
+69 69
+68 68
+67 67
+66 66
+65 65
+64 64
+63 63
+62 62
+61 61
+60 60
+59 59
+58 58
+57 57
+56 56
+55 55
+54 54
+53 53
+52 52
+51 51
+50 50
+49 49
+48 48
+47 47
+46 46
+45 45
+44 44
+43 43
+42 42
+41 41
+40 40
+39 39
+38 38
+37 37
+36 36
+35 35
+34 34
+33 33
+32 32
+31 31
+30 30
+29 29
+28 28
+27 27
+26 26
+25 25
+24 24
+23 23
+22 22
+21 21
+20 20
+19 19
+18 18
+17 17
+16 16
+15 15
+14 14
+13 13
+12 12
+11 11
+10 10
+9 9
+8 8
+7 7
+6 6
+5 5
+4 4
+3 3
+2 2
+1 1

Modified: gauger/web/test_data5
===================================================================
--- gauger/web/test_data5       2011-05-31 00:15:15 UTC (rev 15362)
+++ gauger/web/test_data5       2011-05-31 03:02:00 UTC (rev 15363)
@@ -1,100 +1,100 @@
-9930 9930
-17557 17557
-17200 17200
-9128 9128
-12251 12251
-10401 10401
-3231 3231
-23404 23404
-13993 13993
-17158 17158
-5271 5271
-8145 8145
-12015 12015
-29946 29946
-6445 6445
-10766 10766
-6941 6941
-15301 15301
-24220 24220
-29257 29257
-27714 27714
-32288 32288
-10134 10134
-4924 4924
-8967 8967
-31128 31128
-9455 9455
-732 732
-3942 3942
-18705 18705
-5982 5982
-20749 20749
-32733 32733
-24764 24764
-1831 1831
-12222 12222
-171 171
-32590 32590
-31739 31739
-31055 31055
-26766 26766
-4598 4598
-704 704
-22757 22757
-21215 21215
-24973 24973
-3800 3800
-10252 10252
-24212 24212
-26861 26861
-27703 27703
-25359 25359
-8821 8821
-29501 29501
-1002 1002
-7801 7801
-21324 21324
-23530 23530
-9448 9448
-9293 9293
-6670 6670
-11546 11546
-14026 14026
-12984 12984
-198 198
-2363 2363
-19398 19398
-22510 22510
-28242 28242
-7115 7115
-18793 18793
-16129 16129
-12253 12253
-32200 32200
-30872 30872
-30219 30219
-4813 4813
-8899 8899
-29841 29841
-2884 2884
-17906 17906
-25811 25811
-903 903
-12734 12734
-4026 4026
-11546 11546
-13208 13208
-6072 6072
-29225 29225
-11605 11605
-21718 21718
-28312 28312
-30497 30497
-22127 22127
-21491 21491
-20512 20512
-5007 5007
-19748 19748
-21482 21482
-24278 24278
+1 95
+2 111
+3 106
+4 104
+5 95
+6 116
+7 94
+8 99
+9 106
+10 93
+11 102
+12 96
+13 107
+14 113
+15 90
+16 111
+17 121
+18 110
+19 107
+20 94
+21 112
+22 101
+23 109
+24 92
+25 110
+26 117
+27 117
+28 106
+29 102
+30 91
+31 120
+32 118
+33 109
+34 91
+35 114
+36 111
+37 116
+38 102
+39 103
+40 104
+41 93
+42 120
+43 103
+44 90
+45 100
+46 112
+47 91
+48 108
+49 104
+50 103
+51 94
+52 108
+53 119
+54 120
+55 114
+56 92
+57 121
+58 116
+59 115
+60 111
+61 114
+62 99
+63 108
+64 103
+65 90
+66 93
+67 93
+68 104
+69 111
+70 108
+71 95
+72 112
+73 91
+74 120
+75 108
+76 122
+77 106
+78 92
+79 103
+80 92
+81 116
+82 94
+83 90
+84 98
+85 113
+86 105
+87 94
+88 92
+89 109
+90 91
+91 114
+92 101
+93 95
+94 109
+95 120
+96 105
+97 104
+98 101
+99 101
+100 106