Return BadRequest on X-Delete-At/After headers

Gluster-swift does not support X-Delete-After or X-Delete-At
headers.  The code needs to inform the caller with a 400-BadRequest
if they use these headers.

Change-Id: Ic9d3a1646c0d26bb0204245efce4501f7479fee6
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/6364
Reviewed-by: Chetan Risbud <crisbud@redhat.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 3745a9f..4467b12 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -4358,6 +4358,7 @@ class TestObjectController(unittest.TestCase):
         self.assert_(called[0])
 
     def test_POST_converts_delete_after_to_delete_at(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             controller = proxy_server.ObjectController(self.app, 'account',
                                                        'container', 'object')
@@ -4394,6 +4395,7 @@ class TestObjectController(unittest.TestCase):
                 time.time = orig_time
 
     def test_POST_non_int_delete_after(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             controller = proxy_server.ObjectController(self.app, 'account',
                                                        'container', 'object')
@@ -4408,6 +4410,7 @@ class TestObjectController(unittest.TestCase):
             self.assertTrue('Non-integer X-Delete-After' in res.body)
 
     def test_POST_negative_delete_after(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             controller = proxy_server.ObjectController(self.app, 'account',
                                                        'container', 'object')
@@ -4422,6 +4425,7 @@ class TestObjectController(unittest.TestCase):
             self.assertTrue('X-Delete-At in past' in res.body)
 
     def test_POST_delete_at(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             given_headers = {}
 
@@ -4466,6 +4470,7 @@ class TestObjectController(unittest.TestCase):
             self.assertTrue('X-Delete-At in past' in resp.body)
 
     def test_PUT_converts_delete_after_to_delete_at(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             controller = proxy_server.ObjectController(self.app, 'account',
                                                        'container', 'object')
@@ -4488,6 +4493,7 @@ class TestObjectController(unittest.TestCase):
                 time.time = orig_time
 
     def test_PUT_non_int_delete_after(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             controller = proxy_server.ObjectController(self.app, 'account',
                                                        'container', 'object')
@@ -4503,6 +4509,7 @@ class TestObjectController(unittest.TestCase):
             self.assertTrue('Non-integer X-Delete-After' in res.body)
 
     def test_PUT_negative_delete_after(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             controller = proxy_server.ObjectController(self.app, 'account',
                                                        'container', 'object')
@@ -4518,6 +4525,7 @@ class TestObjectController(unittest.TestCase):
             self.assertTrue('X-Delete-At in past' in res.body)
 
     def test_PUT_delete_at(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         with save_globals():
             given_headers = {}
 
@@ -4894,6 +4902,7 @@ class TestObjectController(unittest.TestCase):
 
     @mock.patch('time.time', new=lambda: STATIC_TIME)
     def test_PUT_x_delete_at_with_fewer_container_replicas(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         self.app.container_ring.set_replicas(2)
 
         delete_at_timestamp = int(time.time()) + 100000
@@ -4929,6 +4938,7 @@ class TestObjectController(unittest.TestCase):
 
     @mock.patch('time.time', new=lambda: STATIC_TIME)
     def test_PUT_x_delete_at_with_more_container_replicas(self):
+        raise SkipTest("X-Delete-At and X-Delete-After are not supported")
         self.app.container_ring.set_replicas(4)
         self.app.expiring_objects_account = 'expires'
         self.app.expiring_objects_container_divisor = 60