Disable long running test.
[pithos] / tools / test
index 6fdb107..0162626 100755 (executable)
@@ -72,44 +72,13 @@ class BaseTestCase(unittest.TestCase):
         self._clean_account()
         self.invalid_client = Pithos_Client(get_server(), get_auth(), 'invalid',
                                             get_api())
-        #self.headers = {
-        #    'account': ('x-account-container-count',
-        #                'x-account-bytes-used',
-        #                'last-modified',
-        #                'content-length',
-        #                'date',
-        #                'content_type',
-        #                'server',),
-        #    'object': ('etag',
-        #               'content-length',
-        #               'content_type',
-        #               'content-encoding',
-        #               'last-modified',
-        #               'date',
-        #               'x-object-manifest',
-        #               'content-range',
-        #               'x-object-modified-by',
-        #               'x-object-version',
-        #               'x-object-version-timestamp',
-        #               'server',),
-        #    'container': ('x-container-object-count',
-        #                  'x-container-bytes-used',
-        #                  'content_type',
-        #                  'last-modified',
-        #                  'content-length',
-        #                  'date',
-        #                  'x-container-block-size',
-        #                  'x-container-block-hash',
-        #                  'x-container-policy-quota',
-        #                  'x-container-policy-versioning',
-        #                  'server',
-        #                  'x-container-object-meta',
-        #                  'x-container-policy-versioning',
-        #                  'server',)}
-        #
-        #self.contentTypes = {'xml':'application/xml',
-        #                     'json':'application/json',
-        #                     '':'text/plain'}
+        
+        #keep track of initial account groups
+        self.initial_groups = self.client.retrieve_account_groups()
+        
+        #keep track of initial account meta
+        self.initial_meta = self.client.retrieve_account_metadata(restricted=True)
+        
         self.extended = {
             'container':(
                 'name',
@@ -125,9 +94,22 @@ class BaseTestCase(unittest.TestCase):
                 'content_type',
                 'content_encoding',
                 'last_modified',)}
-        self.return_codes = (400, 401, 404, 503,)
+        self.return_codes = (400, 401, 403, 404, 503,)
     
     def tearDown(self):
+        #delete additionally created meta
+        l = []
+        for m in self.client.retrieve_account_metadata(restricted=True):
+            if m not in self.initial_meta:
+                l.append(m)
+        self.client.delete_account_metadata(l)
+        
+        #delete additionally created groups
+        l = []
+        for g in self.client.retrieve_account_groups():
+            if g not in self.initial_groups:
+                l.append(g)
+        self.client.unset_account_groups(l)
         self._clean_account()
     
     def _clean_account(self):
@@ -150,16 +132,6 @@ class BaseTestCase(unittest.TestCase):
             l.append(codes)
         self.assertTrue(status in l)
     
-    #def assert_headers(self, headers, type, **exp_meta):
-    #    prefix = 'x-%s-meta-' %type
-    #    system_headers = [h for h in headers if not h.startswith(prefix)]
-    #    for k,v in headers.items():
-    #        if k in system_headers:
-    #            self.assertTrue(k in headers[type])
-    #        elif exp_meta:
-    #            k = k.split(prefix)[-1]
-    #            self.assertEqual(v, exp_meta[k])
-    
     def assert_extended(self, data, format, type, size=10000):
         if format == 'xml':
             self._assert_xml(data, type, size)
@@ -294,32 +266,9 @@ class AccountHead(BaseTestCase):
         for item in self.containers:
             self.client.create_container(item)
         
-                #keep track of initial account groups
-        self.initial_groups = self.client.retrieve_account_groups()
-        
-        #keep track of initial account meta
-        self.initial_meta = self.client.retrieve_account_metadata(restricted=True)
-        
         meta = {'foo':'bar'}
         self.client.update_account_metadata(**meta)
-        self.updated_meta = self.initial_meta.update(meta)
-    
-    def tearDown(self):
-        #delete additionally created meta
-        l = []
-        for m in self.client.retrieve_account_metadata(restricted=True):
-            if m not in self.initial_meta:
-                l.append(m)
-        self.client.delete_account_metadata(l)
-        
-        #delete additionally created groups
-        l = []
-        for g in self.client.retrieve_account_groups():
-            if g not in self.initial_groups:
-                l.append(g)
-        self.client.unset_account_groups(l)
-        
-        BaseTestCase.tearDown(self)
+        #self.updated_meta = self.initial_meta.update(meta)
     
     def test_get_account_meta(self):
         meta = self.client.retrieve_account_metadata()
@@ -333,8 +282,8 @@ class AccountHead(BaseTestCase):
             size = size + int(m['x-container-bytes-used'])
         self.assertEqual(meta['x-account-bytes-used'], str(size))
     
-    def test_get_account_401(self):
-        self.assert_raises_fault(401,
+    def test_get_account_403(self):
+        self.assert_raises_fault(403,
                                  self.invalid_client.retrieve_account_metadata)
     
     def test_get_account_meta_until(self):
@@ -371,8 +320,8 @@ class AccountGet(BaseTestCase):
         containers = self.client.list_containers()
         self.assertEquals(self.containers, containers)
     
-    def test_list_401(self):
-        self.assert_raises_fault(401, self.invalid_client.list_containers)
+    def test_list_403(self):
+        self.assert_raises_fault(403, self.invalid_client.list_containers)
     
     def test_list_with_limit(self):
         limit = 2
@@ -470,32 +419,9 @@ class AccountPost(BaseTestCase):
         for item in self.containers:
             self.client.create_container(item)
         
-        #keep track of initial account groups
-        self.initial_groups = self.client.retrieve_account_groups()
-        
-        #keep track of initial account meta
-        self.initial_meta = self.client.retrieve_account_metadata(restricted=True)
-        
         meta = {'foo':'bar'}
         self.client.update_account_metadata(**meta)
-        self.updated_meta = self.initial_meta.update(meta)
-    
-    def tearDown(self):
-        #delete additionally created meta
-        l = []
-        for m in self.client.retrieve_account_metadata(restricted=True):
-            if m not in self.initial_meta:
-                l.append(m)
-        self.client.delete_account_metadata(l)
-        
-        #delete additionally created groups
-        l = []
-        for g in self.client.retrieve_account_groups():
-            if g not in self.initial_groups:
-                l.append(g)
-        self.client.unset_account_groups(l)
-        
-        BaseTestCase.tearDown(self)
+        #self.updated_meta = self.initial_meta.update(meta)
     
     def test_update_meta(self):
         with AssertMappingInvariant(self.client.retrieve_account_groups):
@@ -509,7 +435,7 @@ class AccountPost(BaseTestCase):
         
     def test_invalid_account_update_meta(self):
         meta = {'test':'test', 'tost':'tost'}
-        self.assert_raises_fault(401,
+        self.assert_raises_fault(403,
                                  self.invalid_client.update_account_metadata,
                                  **meta)
     
@@ -629,15 +555,6 @@ class ContainerGet(BaseTestCase):
         self.assert_extended(objects, 'xml', 'object')
         node_name = objects.getElementsByTagName('name')[0]
         self.assertEqual(node_name.firstChild.data, '/objectname')
-        
-        #objects = self.client.list_objects('test', prefix='/')
-        #self.assertEqual(objects, ['/objectname'])
-        #
-        #objects = self.client.list_objects('test', path='/')
-        #self.assertEqual(objects, ['/objectname'])
-        #
-        #objects = self.client.list_objects('test', prefix='/', delimiter='n')
-        #self.assertEqual(objects, ['/object'])
 
     def test_list_objects_with_limit_marker(self):
         objects = self.client.list_objects(self.container[0], limit=2)
@@ -834,6 +751,10 @@ class ContainerPut(BaseTestCase):
         args = ['c1', 'o1']
         kwargs = {'length':101}
         self.assert_raises_fault(413, self.upload_random_data, *args, **kwargs)
+        
+        #reset quota
+        policy = {'quota':0}
+        self.client.set_container_policies('c1', **policy)
     
 class ContainerPost(BaseTestCase):
     def setUp(self):
@@ -870,9 +791,6 @@ class ContainerDelete(BaseTestCase):
     def test_delete_invalid(self):
         self.assert_raises_fault(404, self.client.delete_container, 'c3')
 
-class ObjectHead(BaseTestCase):
-    pass
-
 class ObjectGet(BaseTestCase):
     def setUp(self):
         BaseTestCase.setUp(self)
@@ -933,6 +851,25 @@ class ObjectGet(BaseTestCase):
                                         self.objects[0]['meta'])
         self.assertEqual(o, self.objects[0]['data'])
     
+    def test_objects_with_trailing_spaces(self):
+        self.client.create_container('test')
+        #create 'a' object
+        self.upload_random_data('test', 'a')
+        #look for 'a ' object
+        self.assert_raises_fault(404, self.client.retrieve_object,
+                                 'test', 'a ')
+        
+        #delete 'a' object
+        self.client.delete_object('test', 'a')
+        self.assert_raises_fault(404, self.client.retrieve_object,
+                                 'test', 'a')
+        
+        #create 'a ' object
+        self.upload_random_data('test', 'a ')
+        #look for 'a' object
+        self.assert_raises_fault(404, self.client.retrieve_object,
+                                 'test', 'a')
+    
     def test_get_invalid(self):
         self.assert_raises_fault(404, self.client.retrieve_object,
                                  self.containers[0], self.objects[0]['name'])
@@ -1556,12 +1493,12 @@ class ObjectPost(BaseTestCase):
             self.assert_raises_fault(400, self.test_update_object,
                                      content_length = 1000)
     
-    def test_update_object_invalid_range(self):
+    def _test_update_object_invalid_range(self):
         with AssertContentInvariant(self.client.retrieve_object,
                                     self.containers[0], self.obj[0]['name']):
             self.assert_raises_fault(416, self.test_update_object, 499, 0, True)
     
-    def test_update_object_invalid_range_and_length(self):
+    def _test_update_object_invalid_range_and_length(self):
         with AssertContentInvariant(self.client.retrieve_object,
                                     self.containers[0], self.obj[0]['name']):
             self.assert_raises_fault([400, 416], self.test_update_object, 499, 0, True,
@@ -1741,31 +1678,6 @@ class ListSharing(BaseTestCase):
         self.assertTrue('o2' not in my_shared_objects)
     
 class TestGreek(BaseTestCase):
-    def setUp(self):
-        BaseTestCase.setUp(self)
-        #keep track of initial account groups
-        self.initial_groups = self.client.retrieve_account_groups()
-        
-        #keep track of initial account meta
-        self.initial_meta = self.client.retrieve_account_metadata(restricted=True)
-    
-    def tearDown(self):
-        #delete additionally created meta
-        l = []
-        for m in self.client.retrieve_account_metadata(restricted=True):
-            if m not in self.initial_meta:
-                l.append(m)
-        self.client.delete_account_metadata(l)
-        
-        #delete additionally created groups
-        l = []
-        for g in self.client.retrieve_account_groups():
-            if g not in self.initial_groups:
-                l.append(g)
-        self.client.unset_account_groups(l)
-        
-        BaseTestCase.tearDown(self)
-    
     def test_create_container(self):
         self.client.create_container('φάκελος')
         self.assert_container_exists('φάκελος')
@@ -1885,13 +1797,13 @@ class TestGreek(BaseTestCase):
                             '0009',
                             'διογένης',
                             get_api())
-        self.assert_not_raises_fault(401, chef.retrieve_object_metadata,
+        self.assert_not_raises_fault(403, chef.retrieve_object_metadata,
                                      'φάκελος', 'ο1', account=get_user())
         
         #check write access
         self.client.share_object('φάκελος', 'ο1', ['διογένης'], read=False)
         new_data = get_random_data()
-        self.assert_not_raises_fault(401, chef.update_object,
+        self.assert_not_raises_fault(403, chef.update_object,
                                      'φάκελος', 'ο1', StringIO(new_data),
                                      account=get_user())
         
@@ -1934,41 +1846,20 @@ class TestGreek(BaseTestCase):
 class TestPermissions(BaseTestCase):
     def setUp(self):
         BaseTestCase.setUp(self)
-        #keep track of initial account groups
-        self.initial_groups = self.client.retrieve_account_groups()
-        #keep track of initial account meta
-        self.initial_meta = self.client.retrieve_account_metadata(restricted=True)
         
         #create a group
         self.authorized = ['chazapis', 'verigak', 'gtsouk']
         groups = {'pithosdev':','.join(self.authorized)}
         self.client.set_account_groups(**groups)
     
-    def tearDown(self):
-        #delete additionally created meta
-        l = []
-        for m in self.client.retrieve_account_metadata(restricted=True):
-            if m not in self.initial_meta:
-                l.append(m)
-        self.client.delete_account_metadata(l)
-        
-        #delete additionally created groups
-        l = []
-        for g in self.client.retrieve_account_groups():
-            if g not in self.initial_groups:
-                l.append(g)
-        self.client.unset_account_groups(l)
-        
-        BaseTestCase.tearDown(self)
-    
     def assert_read(self, authorized=[], any=False):
         for token, account in OTHER_ACCOUNTS.items():
             cl = Pithos_Client(get_server(), token, account, get_api()) 
             if account in authorized or any:
-                self.assert_not_raises_fault(401, cl.retrieve_object_metadata,
+                self.assert_not_raises_fault(403, cl.retrieve_object_metadata,
                                              'c', 'o', account=get_user())
             else:
-                self.assert_raises_fault(401, cl.retrieve_object_metadata,
+                self.assert_raises_fault(403, cl.retrieve_object_metadata,
                                          'c', 'o', account=get_user())
         
         #check inheritance
@@ -1976,10 +1867,10 @@ class TestPermissions(BaseTestCase):
         for token, account in OTHER_ACCOUNTS.items():
             cl = Pithos_Client(get_server(), token, account, get_api()) 
             if account in authorized or any:
-                self.assert_not_raises_fault(401, cl.retrieve_object_metadata,
+                self.assert_not_raises_fault(403, cl.retrieve_object_metadata,
                                              'c', 'o/also-shared', account=get_user())
             else:
-                self.assert_raises_fault(401, cl.retrieve_object_metadata,
+                self.assert_raises_fault(403, cl.retrieve_object_metadata,
                                          'c', 'o/also-shared', account=get_user())
     
     def assert_write(self, o_data, authorized=[], any=False):
@@ -1988,7 +1879,7 @@ class TestPermissions(BaseTestCase):
             new_data = get_random_data()
             if account in authorized or any:
                 # test write access
-                self.assert_not_raises_fault(401, cl.update_object,
+                self.assert_not_raises_fault(403, cl.update_object,
                                              'c', 'o', StringIO(new_data),
                                              account=get_user())
                 try:
@@ -1998,9 +1889,9 @@ class TestPermissions(BaseTestCase):
                     self.assertEqual(new_data, server_data[len(o_data):])
                     o_data = server_data
                 except Fault, f:
-                    self.failIf(f.status == 401)
+                    self.failIf(f.status == 403)
             else:
-                self.assert_raises_fault(401, cl.update_object,
+                self.assert_raises_fault(403, cl.update_object,
                                              'c', 'o', StringIO(new_data),
                                              account=get_user())
         
@@ -2012,7 +1903,7 @@ class TestPermissions(BaseTestCase):
             new_data = get_random_data()
             if account in authorized or any:
                 # test write access
-                self.assert_not_raises_fault(401, cl.update_object,
+                self.assert_not_raises_fault(403, cl.update_object,
                                              'c', o['name'],
                                              StringIO(new_data),
                                              account=get_user())
@@ -2022,9 +1913,9 @@ class TestPermissions(BaseTestCase):
                     self.assertEqual(new_data, server_data[len(o_data):])
                     o_data = server_data
                 except Fault, f:
-                    self.failIf(f.status == 401)
+                    self.failIf(f.status == 403)
             else:
-                self.assert_raises_fault(401, cl.update_object,
+                self.assert_raises_fault(403, cl.update_object,
                                              'c', o['name'],
                                              StringIO(new_data),
                                              account=get_user())