openstack/swift
Code Issues Proposed changes

Merge "give value [] if disallowed_metadata_keys is None"

Browse Source
This commit is contained in:
Jenkins 2013-08-01 17:16:01 +00:00 committed by Gerrit Code Review
commit b7907f3a9c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/obj/diskfile.py
View File

@ -364,7 +364,7 @@ class DiskFile(object):
self.device_path = join(path, device)
self.tmpdir = join(path, device, 'tmp')
self.logger = logger
self.disallowed_metadata_keys = disallowed_metadata_keys
self.disallowed_metadata_keys = disallowed_metadata_keys or []
self.metadata = {}
self.meta_file = None
self.data_file = None

6
test/unit/obj/test_diskfile.py
View File

@ -342,6 +342,12 @@ class TestDiskFile(unittest.TestCase):
FakeLogger(), keep_data_fp=keep_data_fp)
return df
def test_disk_file_default_disallowed_metadata(self):
keep_data_fp = True
df = diskfile.DiskFile(self.testdir, 'sda1', '0', 'a', 'c', 'o',
FakeLogger(), keep_data_fp=keep_data_fp)
self.assertEquals(df.disallowed_metadata_keys, [])
def test_disk_file_app_iter_corners(self):
df = self._create_test_file('1234567890')
self.assertEquals(''.join(df.app_iter_range(0, None)), '1234567890')