Changeset 1807

Show
Ignore:
Timestamp:
2006-01-15 19:09:08 (3 years ago)
Author:
ctford
Message:

Updated to reflect that anxrip adds in stream tags, making anxripped cmml different from served cmml.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • phpannodex-cgi/trunk/Tests/cgi_test.sh

    r1800 r1807  
    6262url=$1 
    6363 
    64  
    65 # HEADER AND ACCEPT DIFFERENTIATION TESTS 
    66  
    67 echo "***Header and Accept Differentiation Tests***" 
    68 head_regexp="HTTP/1.1 200 OK 
    69 Server: .* 
    70 Content-Type: $anx_mime  
    71 X-Content-Bitrate-Average: ?-[0-9]*?\.[0-9]* 
    72 X-Content-Duration: [0-9]*?\.[0-9]*" 
    73  
    74 cmml_head_regexp="HTTP/1.1 200 OK 
    75 Server: .* 
    76 Content-Type: $cmml_mime"  
    77  
    7864# check URL works 
    7965head=`curl $url --head --silent` 
    …… 
    8470fi 
    8571 
     72 
     73# HEADER TESTS 
     74 
     75echo "***Header Tests***" 
     76anx_head_regexp="HTTP/1.1 200 OK 
     77Date: .* 
     78Server: .* 
     79X-Content-Bitrate-Average: ?-[0-9]*?\.[0-9]* 
     80X-Content-Duration: [0-9]*?\.[0-9]* 
     81Content-Type: $anx_mime"  
     82 
     83cmml_head_regexp="HTTP/1.1 200 OK 
     84Date: .* 
     85Server: .* 
     86Content-Length: .* 
     87Content-Type: $cmml_mime"  
     88 
     89 
    8690# anx header well formed? 
    87 pos=`expr match "$head" "$head_regexp"` 
     91pos=`expr match "$head" "$anx_head_regexp"` 
    8892if [ ! $pos ]; then 
    8993        fail "Annodex header badly formed: '$head'"  
    …… 
    102106 
    103107echo "" 
    104  
    105108 
    106109# OGG VALIDATION TESTS 
    …… 
    134137# cmml same as anxripped? 
    135138ripped_cmml="ripped_cmml.temp" 
    136 anxrip $ogg > $ripped_cmml 2> /dev/null 
    137 diffs=`diff -w $cmml $ripped_cmml` 
    138 if [ "$diffs" ]; then 
    139       fail "Ripped CMML different from served CMML" 
    140 else 
    141       succeed "Ripped CMML matches served CMML" 
    142 fi 
     139#anxrip $ogg > $ripped_cmml 2> /dev/null 
     140#diffs=`diff -w $cmml $ripped_cmml` 
     141#if [ "$diffs" ]; then 
     142#     fail "Ripped CMML different from served CMML" 
     143#else 
     144#     succeed "Ripped CMML matches served CMML" 
     145#fi 
    143146 
    144147echo "" 
    …… 
    150153 
    151154# clean 
    152 #rm $ripped_cmml 
    153 #rm $ogg 
    154 #rm $cmml 
     155rm -f $ripped_cmml 
     156rm -f $ogg 
     157rm -f $cmml 
    155158 
    156159# print results