[naviserver-commits] naviserver/tests http_byteranges.test,1.5,1.6

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

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

Modified Files:
	http_byteranges.test 
Log Message:
Add back preliminary support for HTTP range requests.


Index: http_byteranges.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/http_byteranges.test,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** http_byteranges.test	5 Jul 2005 23:36:06 -0000	1.5
--- http_byteranges.test	6 Jul 2005 00:47:36 -0000	1.6
***************
*** 49,55 ****
  
  
! test byteranges-1.1 {Simple range, beginning} -constraints {
!     serverListen knownBug
! } -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} \
***************
*** 57,63 ****
  } -result {206 5 {bytes 0-4/10} 01234}
  
! test byteranges-1.2 {Simple range, end} -constraints {
!     serverListen knownBug
! } -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} \
***************
*** 65,71 ****
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test byteranges-1.3 {Relative range} -constraints {
!     serverListen knownBug
! } -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} \
***************
*** 73,79 ****
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test byteranges-1.4 {Relative range} -constraints {
!     serverListen knownBug
! } -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} \
***************
*** 81,87 ****
  } -result {206 5 {bytes 5-9/10} 56789}
  
! test byteranges-1.5 {Single byte (1st)} -constraints {
!     serverListen knownBug
! } -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} \
***************
*** 89,95 ****
  } -result {206 1 {bytes 0-0/10} 0}
  
! test byteranges-1.6 {Single byte (2nd)} -constraints {
!     serverListen knownBug
! } -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} \
***************
*** 97,103 ****
  } -result {206 1 {bytes 1-1/10} 1}
  
! test byteranges-1.7 {Single byte (last)} -constraints {
!     serverListen knownBug
! } -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.7 {Single byte (last)} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=9-9} \
          -getheaders {Content-length Content-range} \
***************
*** 105,111 ****
  } -result {206 1 {bytes 9-9/10} 9}
  
! test byteranges-1.8 {Request more than exists} -constraints {
!     serverListen knownBug
! } -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.8 {Request more than exists} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=0-10} \
          -getheaders {Content-length Content-range} \
***************
*** 113,119 ****
  } -result {206 10 {bytes 0-9/10} 0123456789}
  
! test byteranges-1.9 {Request more than exists} -constraints {
!     serverListen knownBug
! } -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.9 {Request more than exists} -constraints serverListen -body {
      nstest_http -getbody 1 -setheaders {Range bytes=-10} \
          -getheaders {Content-length Content-range} \
***************
*** 183,186 ****
--- 165,176 ----
  }]
  
+ 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}
+ 
  
  
***************
*** 241,254 ****
  
  
! test byteranges-4.1 {unsatisfiable} -constraints {
!     serverListen knownBug
! } -body {
      nstest_http -setheaders {Range bytes=10-10} -getheaders {Content-range} \
          GET /10bytes
  } -result {416 {bytes */10}}
  
! test byteranges-4.2 {unsatisfiable} -constraints {
!     serverListen knownBug
! } -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