openstack/glance
Code Issues Proposed changes

Merge "Fix indentation errors found by Pep8 1.4.6+"

Browse Source
This commit is contained in:
Jenkins 2014-02-05 01:45:45 +00:00 committed by Gerrit Code Review
commit fd99958b33
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glance/tests/functional/db/base.py
View File

@ -1278,8 +1278,8 @@ class TaskTests(test_utils.BaseTestCase):
'input': {'import_from': 'file:///a.img',
'import_from_format': 'qcow2',
'image_properties': {
"name": "GreatStack 1.22",
"tags": ["lamp", "custom"]
"name": "GreatStack 1.22",
"tags": ["lamp", "custom"]
}},
},
{
@ -1288,17 +1288,18 @@ class TaskTests(test_utils.BaseTestCase):
'input': {'import_from': 'file:///b.img',
'import_from_format': 'qcow2',
'image_properties': {
"name": "GreatStack 1.23",
"tags": ["lamp", "good"]
"name": "GreatStack 1.23",
"tags": ["lamp", "good"]
}},
},
{
'owner': self.context.owner,
"type": "export",
"input": {
"export_uuid": "deadbeef-dead-dead-dead-beefbeefbeef",
"export_to": "swift://cloud.foo/myaccount/mycontainer/path",
"export_format": "qcow2"
"export_uuid": "deadbeef-dead-dead-dead-beefbeefbeef",
"export_to":
"swift://cloud.foo/myaccount/mycontainer/path",
"export_format": "qcow2"
}
},
]

6
glance/tests/functional/v2/test_images.py
View File

@ -288,9 +288,9 @@ class TestImages(functional.FunctionalTest):
for i in range(3):
changes.append({'op': 'add', 'path': '/locations/-',
'value': {'url': 'file://{0}'.format(
os.path.join(self.test_dir,
'fake_image_%i' % i)),
'metadata': {}},
os.path.join(self.test_dir,
'fake_image_%i' % i)),
'metadata': {}},
})
data = jsonutils.dumps(changes)

12
glance/tests/functional/v2/test_tasks.py
View File

@ -106,12 +106,12 @@ class TestTasks(functional.FunctionalTest):
'status': 'pending',
'type': 'import',
'input': {
"import_from": self.file_path,
"import_from_format": "qcow2",
"image_properties": {
'disk_format': 'vhd',
'container_format': 'ovf'
}},
"import_from": self.file_path,
"import_from_format": "qcow2",
"image_properties": {
'disk_format': 'vhd',
'container_format': 'ovf'
}},
'schema': '/v2/schemas/task',
}
for key, value in expected_task.items():