naviserver-commits

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12777/tests

Modified Files:
	http_byteranges.test 
Log Message:
        * tests/http_byteranges.test: Use the 'knownBug' test contraint to
        dissable multiple-range tests so that they are counted in the 'Skipped'
        column of the test results and are not forgottena about. Added a new,
        temporary test for multiple ranges to ensure that multiple-range
        requests are ignored, not half fulfilled.  Re-added test 2.3 which
        tests multiple, overlapping ranges (non canonical in RFC speak);
        dissabled as a 'knownBug'.  Reverted tests 3.1 and 3.2 which check
        syntactically invalid requests are ignored by the server.  An end
        byte before the start byte is never going to work and so is a
        syntactic error, not an unsatisfiable request.  Renamed tests
        byteranges- from http-.


Index: http_byteranges.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/http_byteranges.test,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** http_byteranges.test	29 Jun 2005 15:53:21 -0000	1.3
--- http_byteranges.test	29 Jun 2005 22:27:16 -0000	1.4
***************
*** 49,53 ****
  
  
! test http-1.1 {Simple range, beginning} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-4} \
          -getheaders {Content-length Content-range} \
--- 49,53 ----
  
  
! test byteranges-1.1 {Simple range, beginning} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-4} \
          -getheaders {Content-length Content-range} \
***************
*** 55,59 ****
  } -result {206 5 {bytes 0-4/10} 01234}
  
! test http-1.2 {Simple range, end} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=5-9} \
          -getheaders {Content-length Content-range} \
--- 55,59 ----
  } -result {206 5 {bytes 0-4/10} 01234}
  
! test byteranges-1.2 {Simple range, end} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=5-9} \
          -getheaders {Content-length Content-range} \
***************
*** 61,65 ****
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test http-1.3 {Relative range} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=5-} \
          -getheaders {Content-length Content-range} \
--- 61,65 ----
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test byteranges-1.3 {Relative range} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=5-} \
          -getheaders {Content-length Content-range} \
***************
*** 67,71 ****
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test http-1.4 {Relative range} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=-5} \
          -getheaders {Content-length Content-range} \
--- 67,71 ----
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test byteranges-1.4 {Relative range} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=-5} \
          -getheaders {Content-length Content-range} \
***************
*** 73,77 ****
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test http-1.5 {Single byte (1st)} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-0} \
          -getheaders {Content-length Content-range} \
--- 73,77 ----
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test byteranges-1.5 {Single byte (1st)} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-0} \
          -getheaders {Content-length Content-range} \
***************
*** 79,83 ****
  } -result {206 1 {bytes 0-0/10} 0}
  
! test http-1.6 {Single byte (2nd)} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=1-1} \
          -getheaders {Content-length Content-range} \
--- 79,83 ----
  } -result {206 1 {bytes 0-0/10} 0}
  
! test byteranges-1.6 {Single byte (2nd)} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=1-1} \
          -getheaders {Content-length Content-range} \
***************
*** 85,89 ****
  } -result {206 1 {bytes 1-1/10} 1}
  
! test http-1.6 {Single byte (last)} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=9-9} \
          -getheaders {Content-length Content-range} \
--- 85,89 ----
  } -result {206 1 {bytes 1-1/10} 1}
  
! test byteranges-1.6 {Single byte (last)} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=9-9} \
          -getheaders {Content-length Content-range} \
***************
*** 91,95 ****
  } -result {206 1 {bytes 9-9/10} 9}
  
! test http-1.7 {Request more than exists} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-10} \
          -getheaders {Content-length Content-range} \
--- 91,95 ----
  } -result {206 1 {bytes 9-9/10} 9}
  
! test byteranges-1.7 {Request more than exists} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-10} \
          -getheaders {Content-length Content-range} \
***************
*** 97,101 ****
  } -result {206 10 {bytes 0-9/10} 0123456789}
  
! test http-1.8 {Request more than exists} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=-10} \
          -getheaders {Content-length Content-range} \
--- 97,101 ----
  } -result {206 10 {bytes 0-9/10} 0123456789}
  
! test byteranges-1.8 {Request more than exists} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=-10} \
          -getheaders {Content-length Content-range} \
***************
*** 104,110 ****
  
  
- if { "MultipleSupported" == "NotYet" } {
  
! test http-2.1 {Multiple contiguous ranges} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-2,3-6} \
          -getheaders {Content-length Content-range} \
--- 104,111 ----
  
  
  
! test byteranges-2.1 {Multiple contiguous ranges} -constraints {
!      serverListen knownBug
! } -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-2,3-6} \
          -getheaders {Content-length Content-range} \
***************
*** 112,116 ****
  } -result {206 6 {bytes 0-6/10} 012345}
  
! test http-2.2 {Multiple contiguous ranges} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-2,3-5,6-8} \
          -getheaders {Content-length Content-range} \
--- 113,119 ----
  } -result {206 6 {bytes 0-6/10} 012345}
  
! test byteranges-2.2 {Multiple contiguous ranges} -constraints {
!      serverListen knownBug
! } -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-2,3-5,6-8} \
          -getheaders {Content-length Content-range} \
***************
*** 118,122 ****
  } -result {206 9 {bytes 0-8/10} 012345678}
  
! test http-2.4 {Multiple non-contiguous ranges} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-2,7-9} \
          -getheaders {Content-type Content-range} \
--- 121,135 ----
  } -result {206 9 {bytes 0-8/10} 012345678}
  
! test byteranges-2.3 {Multiple non-canonical contiguous ranges} -constraints {
!     serverListen knownBug
! } -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=0-2,3-6} \
!         -getheaders {Content-length Content-range} \
!         GET /10bytes
! } -result {206 6 {bytes 0-6/10} 012345}
! 
! test byteranges-2.4 {Multiple non-contiguous ranges} -constraints {
!     serverListen knownBug
! } -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-2,7-9} \
          -getheaders {Content-type Content-range} \
***************
*** 134,142 ****
  }]
  
! test http-2.5 {Multiple ranges, out of order} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=7-9,0-2} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
! }  -match regexp -result [list 206 {multipart/byteranges; boundary=[^ ]+} {} \
          {[^ ]+\r
  Content-type: \*/\*\r
--- 147,157 ----
  }]
  
! test byteranges-2.5 {Multiple ranges, out of order} -constraints {
!     serverListen knownBug
! } -body {
      nstest_http -getbody 1 -setheaders {Range bytes=7-9,0-2} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
! } -match regexp -result [list 206 {multipart/byteranges; boundary=[^ ]+} {} \
          {[^ ]+\r
  Content-type: \*/\*\r
***************
*** 150,168 ****
  }]
  
! }
  
! test http-3.1 {invalid offsets} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=3-2} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
! } -result {416 10 {bytes */10} {}}
  
! test http-3.2 {invalid offsets} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=11-10} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
! } -result {416 10 {bytes */10} {}}
  
! test http-3.3 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=} \
          -getheaders {Content-length Content-range} \
--- 165,191 ----
  }]
  
! test byteranges-2.6 {
!     Temporary: multiple ranges unsupported, just ignore.
! } -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=0-2,3-6} \
!         -getheaders {Content-length Content-range} \
!         GET /10bytes
! } -result {200 10 {} 0123456789}
  
! 
! 
! test byteranges-3.1 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=3-2} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
! } -result {200 10 {} 0123456789}
  
! test byteranges-3.2 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=11-10} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
! } -result {200 10 {} 0123456789}
  
! test byteranges-3.3 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=} \
          -getheaders {Content-length Content-range} \
***************
*** 170,174 ****
  } -result {200 10 {} 0123456789}
  
! test http-3.4 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes 0-1} \
          -getheaders {Content-length Content-range} \
--- 193,197 ----
  } -result {200 10 {} 0123456789}
  
! test byteranges-3.4 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes 0-1} \
          -getheaders {Content-length Content-range} \
***************
*** 176,180 ****
  } -result {200 10 {} 0123456789}
  
! test http-3.5 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range 0-1} \
          -getheaders {Content-length Content-range} \
--- 199,203 ----
  } -result {200 10 {} 0123456789}
  
! test byteranges-3.5 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range 0-1} \
          -getheaders {Content-length Content-range} \
***************
*** 182,186 ****
  } -result {200 10 {} 0123456789}
  
! test http-3.6 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range =} \
          -getheaders {Content-length Content-range} \
--- 205,209 ----
  } -result {200 10 {} 0123456789}
  
! test byteranges-3.6 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range =} \
          -getheaders {Content-length Content-range} \
***************
*** 188,192 ****
  } -result {200 10 {} 0123456789}
  
! test http-3.7 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range =-} \
          -getheaders {Content-length Content-range} \
--- 211,215 ----
  } -result {200 10 {} 0123456789}
  
! test byteranges-3.7 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range =-} \
          -getheaders {Content-length Content-range} \
***************
*** 194,198 ****
  } -result {200 10 {} 0123456789}
  
! test http-3.8 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=--6-9} \
          -getheaders {Content-length Content-range} \
--- 217,221 ----
  } -result {200 10 {} 0123456789}
  
! test byteranges-3.8 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=--6-9} \
          -getheaders {Content-length Content-range} \
***************
*** 200,204 ****
  } -result {200 10 {} 0123456789}
  
! test http-3.9 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=1--6} \
          -getheaders {Content-length Content-range} \
--- 223,227 ----
  } -result {200 10 {} 0123456789}
  
! test byteranges-3.9 {syntactically invalid} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=1--6} \
          -getheaders {Content-length Content-range} \
***************
*** 208,217 ****
  
  
! test http-4.1 {unsatisfiable} -constraints serverListen -body {
      nstest_http -setheaders {Range bytes=10-10} -getheaders {Content-range} \
          GET /10bytes
  } -result {416 {bytes */10}}
  
! test http-4.2 {unsatisfiable} -constraints serverListen -body {
      nstest_http -setheaders {Range bytes=10-} -getheaders {Content-range} \
          GET /10bytes
--- 231,240 ----
  
  
! test byteranges-4.1 {unsatisfiable} -constraints serverListen -body {
      nstest_http -setheaders {Range bytes=10-10} -getheaders {Content-range} \
          GET /10bytes
  } -result {416 {bytes */10}}
  
! test byteranges-4.2 {unsatisfiable} -constraints serverListen -body {
      nstest_http -setheaders {Range bytes=10-} -getheaders {Content-range} \
          GET /10bytes