diff --git a/swift/obj/server.py b/swift/obj/server.py index 7a1e99de4c..42f8fecb2e 100644 --- a/swift/obj/server.py +++ b/swift/obj/server.py @@ -231,7 +231,7 @@ class DiskFile(object): return if (self.iter_etag and self.started_at_0 and self.read_to_eof and - self.metadata.has_key('ETag') and + 'ETag' in self.metadata and self.iter_etag.hexdigest() != self.metadata.get('ETag')): self.quarantine() @@ -351,7 +351,7 @@ class DiskFile(object): file_size = 0 if self.data_file: file_size = int(os.path.getsize(self.data_file)) - if self.metadata.has_key('Content-Length'): + if 'Content-Length' in self.metadata: metadata_size = int(self.metadata['Content-Length']) if file_size != metadata_size: raise DiskFileError('Content-Length of %s does not ' diff --git a/test/probe/test_object_failures.py b/test/probe/test_object_failures.py index 8b5fc2c38f..a525067ae0 100644 --- a/test/probe/test_object_failures.py +++ b/test/probe/test_object_failures.py @@ -27,6 +27,7 @@ from swift.obj.server import write_metadata, read_metadata from test.probe.common import kill_pids, reset_environment from test.unit import FakeLogger + class TestObjectFailures(unittest.TestCase): def setUp(self): @@ -62,7 +63,6 @@ class TestObjectFailures(unittest.TestCase): data_file = self._get_data_file_path(obj_dir) return onode, opart, data_file - def run_quarantine(self): container = 'container-%s' % uuid4() obj = 'object-%s' % uuid4() @@ -96,7 +96,7 @@ class TestObjectFailures(unittest.TestCase): write_metadata(fp, metadata) for header, result in [({'Range': 'bytes=0-2'}, 'RAN'), ({'Range': 'bytes=1-11'}, 'ANGE'), - ({'Range': 'bytes=0-11'}, 'RANGE'),]: + ({'Range': 'bytes=0-11'}, 'RANGE')]: odata = direct_client.direct_get_object(onode, opart, self.account, container, obj, headers=header)[-1] @@ -118,7 +118,7 @@ class TestObjectFailures(unittest.TestCase): metadata = read_metadata(fp) os.unlink(data_file) - with open(data_file,'w') as fp: + with open(data_file, 'w') as fp: write_metadata(fp, metadata) try: resp = direct_client.direct_get_object(onode, opart, self.account, @@ -137,7 +137,7 @@ class TestObjectFailures(unittest.TestCase): metadata = read_metadata(fp) os.unlink(data_file) - with open(data_file,'w') as fp: + with open(data_file, 'w') as fp: write_metadata(fp, metadata) try: resp = direct_client.direct_head_object(onode, opart, self.account, @@ -156,7 +156,7 @@ class TestObjectFailures(unittest.TestCase): metadata = read_metadata(fp) os.unlink(data_file) - with open(data_file,'w') as fp: + with open(data_file, 'w') as fp: write_metadata(fp, metadata) try: resp = direct_client.direct_post_object( diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py index d3d0166fcd..e8b116c97f 100644 --- a/test/unit/obj/test_server.py +++ b/test/unit/obj/test_server.py @@ -39,6 +39,7 @@ from swift.common.utils import hash_path, mkdirs, normalize_timestamp, \ from swift.common.exceptions import DiskFileNotExist from eventlet import tpool + class TestDiskFile(unittest.TestCase): """Test swift.obj.server.DiskFile""" @@ -169,7 +170,7 @@ class TestDiskFile(unittest.TestCase): keep_data_fp=True, disk_chunk_size=csize) if invalid_type == 'Zero-Byte': os.remove(df.data_file) - fp = open(df.data_file,'w') + fp = open(df.data_file, 'w') fp.close() df.unit_test_len = fsize return df @@ -201,7 +202,7 @@ class TestDiskFile(unittest.TestCase): pass self.assertTrue(df.quarantined_dir) df = self._get_data_file(invalid_type=invalid_type, - obj_name='3',csize=100000) + obj_name='3', csize=100000) for chunk in df: pass self.assertTrue(df.quarantined_dir) @@ -254,7 +255,7 @@ class TestDiskFile(unittest.TestCase): def test_unlinkold(self): df1 = self._get_data_file() - future_time = str(normalize_timestamp(time()+100)) + future_time = str(normalize_timestamp(time() + 100)) df2 = self._get_data_file(ts=future_time) self.assertEquals(len(os.listdir(df1.datadir)), 2) df1.unlinkold(future_time) @@ -262,9 +263,11 @@ class TestDiskFile(unittest.TestCase): self.assertEquals(os.listdir(df1.datadir)[0], "%s.data" % future_time) def test_close_error(self): + def err(): raise Exception("bad") - df = self._get_data_file(fsize=1024*1024*2) + + df = self._get_data_file(fsize=1024 * 1024 * 2) df._handle_close_quarantine = err for chunk in df: pass @@ -429,7 +432,7 @@ class TestObjectController(unittest.TestCase): with open(file.data_file) as fp: metadata = object_server.read_metadata(fp) os.unlink(file.data_file) - with open(file.data_file,'w') as fp: + with open(file.data_file, 'w') as fp: object_server.write_metadata(fp, metadata) self.assertEquals(os.listdir(file.datadir)[0], file_name) @@ -442,8 +445,6 @@ class TestObjectController(unittest.TestCase): os.path.basename(os.path.dirname(file.data_file))) self.assertEquals(os.listdir(quar_dir)[0], file_name) - - def test_PUT_invalid_path(self): req = Request.blank('/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT'}) resp = self.object_controller.PUT(req) @@ -729,7 +730,7 @@ class TestObjectController(unittest.TestCase): with open(file.data_file) as fp: metadata = object_server.read_metadata(fp) os.unlink(file.data_file) - with open(file.data_file,'w') as fp: + with open(file.data_file, 'w') as fp: object_server.write_metadata(fp, metadata) self.assertEquals(os.listdir(file.datadir)[0], file_name) @@ -1048,7 +1049,7 @@ class TestObjectController(unittest.TestCase): with open(file.data_file) as fp: metadata = object_server.read_metadata(fp) os.unlink(file.data_file) - with open(file.data_file,'w') as fp: + with open(file.data_file, 'w') as fp: object_server.write_metadata(fp, metadata) self.assertEquals(os.listdir(file.datadir)[0], file_name) @@ -1060,7 +1061,6 @@ class TestObjectController(unittest.TestCase): os.path.basename(os.path.dirname(file.data_file))) self.assertEquals(os.listdir(quar_dir)[0], file_name) - def test_GET_quarantine_range(self): """ Test swift.object_server.ObjectController.GET """ timestamp = normalize_timestamp(time())