openstack
/
horizon
Code Issues Proposed changes

Merge "Reject result when createImage call has error" into stable/ocata

This commit is contained in:
Jenkins 2017-06-15 12:46:38 +00:00 committed by Gerrit Code Review
parent 6cca25d274 fe27a47817
commit da8513debb
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/static/app/core/openstack-service-api/glance.service.js
View File

@ -169,8 +169,9 @@
onProgress(Math.round(event.loaded / event.total * 100)); onProgress(Math.round(event.loaded / event.total * 100));
} }
function onError() { function onError(error) {
toastService.add('error', gettext('Unable to create the image.')); toastService.add('error', gettext('Unable to create the image.'));
throw error;
} }
return apiService[method]('/api/glance/images/', image) return apiService[method]('/api/glance/images/', image)

19
openstack_dashboard/static/app/core/openstack-service-api/glance.service.spec.js
View File

@ -189,9 +189,15 @@
service.createImage.apply(null, [{name: 1}]); service.createImage.apply(null, [{name: 1}]);
try {
imageQueuedPromise.reject({'data': 'invalid'});
$rootScope.$apply();
}catch (exp) {
expect(exp).toBeDefined();
expect(exp.data).toEqual('invalid');
}
expect(apiService.put).toHaveBeenCalledWith('/api/glance/images/', {name: 1}); expect(apiService.put).toHaveBeenCalledWith('/api/glance/images/', {name: 1});
imageQueuedPromise.reject();
$rootScope.$apply();
expect(toastService.add).toHaveBeenCalledWith('error', "Unable to create the image."); expect(toastService.add).toHaveBeenCalledWith('error', "Unable to create the image.");
}); });
@ -228,8 +234,13 @@
}); });
it('second call is not started if the initial image creation fails', function() { it('second call is not started if the initial image creation fails', function() {
imageQueuedPromise.reject(); try {
$rootScope.$apply(); imageQueuedPromise.reject({'data': 'invalid'});
$rootScope.$apply();
}catch (exp) {
expect(exp).toBeDefined();
expect(exp.data).toEqual('invalid');
}
expect(apiService.put.calls.count()).toBe(1); expect(apiService.put.calls.count()).toBe(1);
}); });