Revision 6ee6677e snf-pithos-app/pithos/api/test/objects.py
b/snf-pithos-app/pithos/api/test/objects.py | ||
---|---|---|
124 | 124 |
|
125 | 125 |
vserial, _ = l2[-2] |
126 | 126 |
self.assertEqual(self.get_object_meta(c, o, version=vserial), |
127 |
{'X-Object-Meta-Quality': 'AAA'})
|
|
127 |
{'Quality': 'AAA'}) |
|
128 | 128 |
|
129 | 129 |
# update data |
130 | 130 |
self.append_object_data(c, o) |
... | ... | |
171 | 171 |
self.assertTrue(o != other_name) |
172 | 172 |
|
173 | 173 |
r = self.get('%s?version=%s' % (url, other_version)) |
174 |
self.assertEqual(r.status_code, 403)
|
|
174 |
self.assertEqual(r.status_code, 404)
|
|
175 | 175 |
|
176 | 176 |
r = self.head('%s?version=%s' % (url, other_version)) |
177 |
self.assertEqual(r.status_code, 403)
|
|
177 |
self.assertEqual(r.status_code, 404)
|
|
178 | 178 |
|
179 | 179 |
def test_objects_with_trailing_spaces(self): |
180 | 180 |
# create object |
... | ... | |
786 | 786 |
append = objects.append |
787 | 787 |
append(self.upload_object(self.container, |
788 | 788 |
'%s/%s' % (folder, get_random_name()), |
789 |
HTTP_X_OBJECT_META_DEPTH='1')[0])
|
|
789 |
depth='1')[0])
|
|
790 | 790 |
append(self.upload_object(self.container, |
791 | 791 |
'%s/%s' % (subfolder, get_random_name()), |
792 |
HTTP_X_OBJECT_META_DEPTH='2')[0])
|
|
792 |
depth='2')[0])
|
|
793 | 793 |
other = self.upload_object(self.container, strnextling(folder))[0] |
794 | 794 |
|
795 | 795 |
# copy dir |
... | ... | |
810 | 810 |
# assert metadata |
811 | 811 |
meta = self.get_object_meta(self.container, obj) |
812 | 812 |
for k in meta.keys(): |
813 |
self.assertTrue(k in r) |
|
814 |
self.assertEqual(r[k], meta[k]) |
|
813 |
key = 'X-Object-Meta-%s' % k |
|
814 |
self.assertTrue(key in r) |
|
815 |
self.assertEqual(r[key], meta[k]) |
|
815 | 816 |
|
816 | 817 |
# assert other has not been created under copy folder |
817 | 818 |
url = join_urls(self.pithos_path, self.user, self.container, |
... | ... | |
865 | 866 |
self.container, oname='%s/%s' % (folder, get_random_name()))[0] |
866 | 867 |
objects = [subfolder] |
867 | 868 |
append = objects.append |
868 |
meta = {} |
|
869 |
meta[objects[0]] = {} |
|
870 | 869 |
append(self.upload_object(self.container, |
871 | 870 |
'%s/%s' % (folder, get_random_name()), |
872 |
HTTP_X_OBJECT_META_DEPTH='1')[0]) |
|
873 |
meta[objects[1]] = {'X-Object-Meta-Depth': '1'} |
|
871 |
depth='1')[0]) |
|
874 | 872 |
append(self.upload_object(self.container, |
875 | 873 |
'%s/%s' % (subfolder, get_random_name()), |
876 |
HTTP_X_OBJECT_META_DEPTH='2')[0]) |
|
877 |
meta[objects[1]] = {'X-Object-Meta-Depth': '2'} |
|
874 |
depth='1')[0]) |
|
878 | 875 |
other = self.upload_object(self.container, strnextling(folder))[0] |
879 | 876 |
|
880 | 877 |
# move dir |
... | ... | |
897 | 894 |
r = self.head(url) |
898 | 895 |
self.assertEqual(r.status_code, 200) |
899 | 896 |
|
900 |
# # assert metadata |
|
901 |
# for k in meta[obj].keys(): |
|
902 |
# self.assertTrue(k in r) |
|
903 |
# self.assertEqual(r[k], meta[obj][k]) |
|
904 |
|
|
905 | 897 |
# assert other has not been created under copy folder |
906 | 898 |
url = join_urls(self.pithos_path, self.user, self.container, |
907 | 899 |
'%s/%s' % (copy_folder, |
... | ... | |
934 | 926 |
meta = self.get_object_meta(self.container, self.object) |
935 | 927 |
|
936 | 928 |
for k, v in d.items(): |
937 |
key = 'X-Object-Meta-%s' % k.title() |
|
938 |
self.assertTrue(key in meta) |
|
939 |
self.assertTrue(meta[key], v) |
|
929 |
self.assertTrue(k.title() in meta) |
|
930 |
self.assertTrue(meta[k.title()], v) |
|
940 | 931 |
|
941 | 932 |
# Header key too large |
942 | 933 |
d = {'a' * 115: 'b' * 256} |
... | ... | |
1066 | 1057 |
range = 'bytes %s-%s/%s' % (first_byte_pos, last_byte_pos, length) |
1067 | 1058 |
kwargs = {'content_type': 'application/octet-stream', |
1068 | 1059 |
'HTTP_CONTENT_RANGE': range, |
1069 |
'CONTENT_LENGTH': partial + 1}
|
|
1060 |
'CONTENT_LENGTH': str(partial + 1)}
|
|
1070 | 1061 |
|
1071 | 1062 |
url = join_urls(self.pithos_path, self.user, self.container, oname) |
1072 | 1063 |
r = self.post(url, data=data, **kwargs) |
... | ... | |
1315 | 1306 |
self.container, oname='%s/%s' % (folder, get_random_name()))[0] |
1316 | 1307 |
objects = [subfolder] |
1317 | 1308 |
append = objects.append |
1318 |
meta = {} |
|
1319 |
meta[objects[0]] = {} |
|
1320 | 1309 |
append(self.upload_object(self.container, |
1321 | 1310 |
'%s/%s' % (folder, get_random_name()), |
1322 |
HTTP_X_OBJECT_META_DEPTH='1')[0]) |
|
1323 |
meta[objects[1]] = {'X-Object-Meta-Depth': '1'} |
|
1311 |
depth='1')[0]) |
|
1324 | 1312 |
append(self.upload_object(self.container, |
1325 | 1313 |
'%s/%s' % (subfolder, get_random_name()), |
1326 |
HTTP_X_OBJECT_META_DEPTH='2')[0]) |
|
1327 |
meta[objects[1]] = {'X-Object-Meta-Depth': '2'} |
|
1314 |
depth='2')[0]) |
|
1328 | 1315 |
other = self.upload_object(self.container, strnextling(folder))[0] |
1329 | 1316 |
|
1330 | 1317 |
# move dir |
Also available in: Unified diff