IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: fix failing tests

Browse Source
This commit is contained in:
Erik Sundell 2018-10-11 14:44:51 +02:00
parent ae8a765190
commit 5deba92d05
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/stackdriver/datasource.ts
View File

@ -200,11 +200,9 @@ export default class StackdriverDatasource {
message = error; message = error;
} else { } else {
message = 'Stackdriver: '; message = 'Stackdriver: ';
message += error.statusText ? error.statusText + ': ' : ''; message += error.statusText ? error.statusText : defaultErrorMessage;
if (error.data && error.data.error && error.data.error.code) { if (error.data && error.data.error && error.data.error.code) {
message += error.data.error.code + '. ' + error.data.error.message; message += ': ' + error.data.error.code + '. ' + error.data.error.message;
} else {
message = defaultErrorMessage;
} }
} }
} finally { } finally {

4
public/app/plugins/datasource/stackdriver/specs/datasource.test.ts
View File

@ -6,7 +6,7 @@ import { TemplateSrvStub } from 'test/specs/helpers';
describe('StackdriverDataSource', () => { describe('StackdriverDataSource', () => {
const instanceSettings = { const instanceSettings = {
jsonData: { jsonData: {
projectName: 'testproject', defaultProject: 'testproject',
}, },
}; };
const templateSrv = new TemplateSrvStub(); const templateSrv = new TemplateSrvStub();
@ -54,7 +54,7 @@ describe('StackdriverDataSource', () => {
Promise.reject({ Promise.reject({
statusText: 'Bad Request', statusText: 'Bad Request',
data: { data: {
error: JSON.stringify({ error: { code: 400, message: 'Field interval.endTime had an invalid value' } }), error: { code: 400, message: 'Field interval.endTime had an invalid value' },
}, },
}), }),
}; };