openstack
/
horizon
Code Issues Proposed changes

Merge "Fix the error format of glance's createImage" into stable/pike

This commit is contained in:
Zuul 2018-02-05 05:02:55 +00:00 committed by Gerrit Code Review
parent 26d36168ce f66f87049d
commit 695910902f
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,8 +170,11 @@
}
function onError(error) {
toastService.add('error', gettext('Unable to create the image.'));
throw error;
if (error && error.data) {
throw error;
} else {
throw gettext('Unable to create the image.');
}
}
return apiService[method]('/api/glance/images/', image)

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

@ -185,20 +185,31 @@
}));
it('shows error message when arguments are insufficient', function() {
spyOn(toastService, 'add');
service.createImage.apply(null, [{name: 1}]);
try {
imageQueuedPromise.reject({'data': 'invalid'});
$rootScope.$apply();
}catch (exp) {
expect(exp).toBeDefined();
expect(exp.data).toEqual('invalid');
} catch (error) {
expect(error).toBeDefined();
expect(error.data).toEqual('invalid');
}
expect(apiService.put).toHaveBeenCalledWith('/api/glance/images/', {name: 1});
});
it('shows a generic message when it gets a unexpected error', function() {
service.createImage.apply(null, [{name: 1}]);
try {
imageQueuedPromise.reject();
$rootScope.$apply();
} catch (error) {
expect(error).toBeDefined();
expect(error).toEqual('Unable to create the image.');
}
expect(apiService.put).toHaveBeenCalledWith('/api/glance/images/', {name: 1});
expect(toastService.add).toHaveBeenCalledWith('error', "Unable to create the image.");
});
describe('external upload of a local file', function() {
@ -237,9 +248,9 @@
try {
imageQueuedPromise.reject({'data': 'invalid'});
$rootScope.$apply();
}catch (exp) {
expect(exp).toBeDefined();
expect(exp.data).toEqual('invalid');
} catch (error) {
expect(error).toBeDefined();
expect(error.data).toEqual('invalid');
}
expect(apiService.put.calls.count()).toBe(1);