[z3-checkins] r38226 - z3/deliverance/branches/cache_aware/deliverance

[ltucker at codespeak.net]

Author: ltucker
Date: Fri Feb  9 02:13:13 2007
New Revision: 38226

Modified:
   z3/deliverance/branches/cache_aware/deliverance/test_wsgi.py
Log:
eliminate tests that are made obsolete by etags-only-if-all-have-etags change

Modified: z3/deliverance/branches/cache_aware/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/cache_aware/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/cache_aware/deliverance/test_wsgi.py	Fri Feb  9 02:13:13 2007
@@ -262,47 +262,6 @@
     status = res.status
     assert(status == 200)
     
-    # test a mixture 
-    theme_info.etag = None
-    rule_info.etag = 'joop'
-    content_info.etag = 'win' 
-    theme_info.mod_time = then - 20 
-    rule_info.mod_time = None
-    content_info.mod_time = None
- 
-    # get the new etag, make sure things are ok for non-cachey req 
-    res = app.get('/content.html')
-    composite_etag = header_value(res.headers, 'etag')
-    assert(composite_etag is not None and len(composite_etag) > 0)
-    assert(res.status == 200)
-
-    # should be not modified with the etags and a date after the mod date 
-    res = app.get('/content.html', 
-                  headers={'If-Modified-Since': formatdate(then-15), 
-                           'If-None-Match': composite_etag})
-    status = res.status
-    assert(status == 304)
-
-    # should be modified if the date is after the mod date since there is 
-    # no etag for theme 
-    res = app.get('/content.html', 
-                  headers={'If-Modified-Since': formatdate(then-25), 
-                           'If-None-Match': composite_etag})
-    status = res.status
-    assert(status == 200)
-
-    # should be modified since there is no etag specified and no 
-    # moddate for rules / content 
-    res = app.get('/content.html', 
-                  headers={'If-Modified-Since': formatdate(then-15)})
-    status = res.status
-    assert(status == 200)
-
-    # should be modified since there is no etag for theme 
-    res = app.get('/content.html', 
-                  headers={'If-None-Match': composite_etag})
-    status = res.status
-    assert(status == 200)