openstack
/
glance
Code Issues Proposed changes

Python3: fix glance.tests.unit.test_migrations 

In Python3, map() is only called if it is consumed. The calls removed
in this patch were no-ops.

Change-Id: I83e2ee05bcda4b765d67dfb6558c6e59afe6f816
This commit is contained in:
Cyril Roelandt 2015-11-12 14:30:37 +01:00
parent 9786b975f8
commit a9ec7ca68d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glance/tests/unit/test_migrations.py
View File

@ -502,7 +502,7 @@ class MigrationsMixin(test_migrations.WalkVersionsMixin):
'file://foo',
]
result = images.select().execute()
locations = map(lambda x: x['location'], result)
locations = list(map(lambda x: x['location'], result))
for loc in quoted_locations:
self.assertIn(loc, locations)
@ -598,7 +598,7 @@ class MigrationsMixin(test_migrations.WalkVersionsMixin):
quoted = 'swift://acct%3Ausr:pass@example.com/container/obj-id'
images = db_utils.get_table(engine, 'images')
result = images.select().execute()
locations = map(lambda x: x['location'], result)
locations = list(map(lambda x: x['location'], result))
actual_location = []
for location in locations:
if location:
@ -638,8 +638,8 @@ class MigrationsMixin(test_migrations.WalkVersionsMixin):
# not be migrated
{'id': 'fake-19-2', 'location': None},
]
map(lambda image: image.update(base_values), data)
for image in data:
image.update(base_values)
images.insert().values(image).execute()
return data
@ -906,8 +906,8 @@ class MigrationsMixin(test_migrations.WalkVersionsMixin):
'result': None
},
]
map(lambda task: task.update(base_values), data)
for task in data:
task.update(base_values)
tasks.insert().values(task).execute()
return data

1
tox.ini
View File

@ -62,6 +62,7 @@ commands =
glance.tests.unit.test_image_cache_client \
glance.tests.unit.test_jsonpatchmixin \
glance.tests.unit.test_manage \
glance.tests.unit.test_migrations \
glance.tests.unit.test_misc \
glance.tests.unit.test_notifier \
glance.tests.unit.test_policy \