openstack/swift
Code Issues Proposed changes

Merge "Fix reading xattrs in object-server's unittests."

Browse Source
This commit is contained in:
Jenkins 2013-04-03 20:55:06 +00:00 committed by Gerrit Code Review
commit ab355e349a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/unit/obj/test_server.py
View File

@ -28,7 +28,6 @@ from hashlib import md5
from eventlet import sleep, spawn, wsgi, listen, Timeout from eventlet import sleep, spawn, wsgi, listen, Timeout
from test.unit import FakeLogger from test.unit import FakeLogger
from test.unit import _getxattr as getxattr
from test.unit import _setxattr as setxattr from test.unit import _setxattr as setxattr
from test.unit import connect_tcp, readuntil2crlfs from test.unit import connect_tcp, readuntil2crlfs
from swift.obj import server as object_server from swift.obj import server as object_server
@ -678,8 +677,7 @@ class TestObjectController(unittest.TestCase):
timestamp + '.data') timestamp + '.data')
self.assert_(os.path.isfile(objfile)) self.assert_(os.path.isfile(objfile))
self.assertEquals(open(objfile).read(), 'VERIFY') self.assertEquals(open(objfile).read(), 'VERIFY')
self.assertEquals(pickle.loads(getxattr(objfile, self.assertEquals(object_server.read_metadata(objfile),
object_server.METADATA_KEY)),
{'X-Timestamp': timestamp, {'X-Timestamp': timestamp,
'Content-Length': '6', 'Content-Length': '6',
'ETag': '0b4c12d7e0a73840c1c4f148fda3b037', 'ETag': '0b4c12d7e0a73840c1c4f148fda3b037',
@ -709,8 +707,7 @@ class TestObjectController(unittest.TestCase):
timestamp + '.data') timestamp + '.data')
self.assert_(os.path.isfile(objfile)) self.assert_(os.path.isfile(objfile))
self.assertEquals(open(objfile).read(), 'VERIFY TWO') self.assertEquals(open(objfile).read(), 'VERIFY TWO')
self.assertEquals(pickle.loads(getxattr(objfile, self.assertEquals(object_server.read_metadata(objfile),
object_server.METADATA_KEY)),
{'X-Timestamp': timestamp, {'X-Timestamp': timestamp,
'Content-Length': '10', 'Content-Length': '10',
'ETag': 'b381a4c5dab1eaa1eb9711fa647cd039', 'ETag': 'b381a4c5dab1eaa1eb9711fa647cd039',
@ -752,8 +749,7 @@ class TestObjectController(unittest.TestCase):
timestamp + '.data') timestamp + '.data')
self.assert_(os.path.isfile(objfile)) self.assert_(os.path.isfile(objfile))
self.assertEquals(open(objfile).read(), 'VERIFY THREE') self.assertEquals(open(objfile).read(), 'VERIFY THREE')
self.assertEquals(pickle.loads(getxattr(objfile, self.assertEquals(object_server.read_metadata(objfile),
object_server.METADATA_KEY)),
{'X-Timestamp': timestamp, {'X-Timestamp': timestamp,
'Content-Length': '12', 'Content-Length': '12',
'ETag': 'b114ab7b90d9ccac4bd5d99cc7ebb568', 'ETag': 'b114ab7b90d9ccac4bd5d99cc7ebb568',
@ -1589,8 +1585,8 @@ class TestObjectController(unittest.TestCase):
storage_directory(object_server.DATADIR, 'p', hash_path('a', 'c', storage_directory(object_server.DATADIR, 'p', hash_path('a', 'c',
'o')), timestamp + '.data') 'o')), timestamp + '.data')
self.assert_(os.path.isfile(objfile)) self.assert_(os.path.isfile(objfile))
self.assertEquals(pickle.loads(getxattr(objfile, self.assertEquals(object_server.read_metadata(objfile),
object_server.METADATA_KEY)), {'X-Timestamp': timestamp, {'X-Timestamp': timestamp,
'Content-Length': '0', 'Content-Type': 'text/plain', 'name': 'Content-Length': '0', 'Content-Type': 'text/plain', 'name':
'/a/c/o', 'X-Object-Manifest': 'c/o/', 'ETag': '/a/c/o', 'X-Object-Manifest': 'c/o/', 'ETag':
'd41d8cd98f00b204e9800998ecf8427e'}) 'd41d8cd98f00b204e9800998ecf8427e'})